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 am: e1998ca0 am: 010050c6

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



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