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

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

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



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