Merge changes from topic "presubmit-am-4e05ec46f83e449a869cf30beb6d2744" into...

Merge changes from topic "presubmit-am-4e05ec46f83e449a869cf30beb6d2744" into sc-v2-dev-plus-aosp am: 3da216c0

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



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