Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into...

Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713



Change-Id: I77bbcb0ee93802449f4645a451df02c8ab3d1fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>