Merge changes from topic "presubmit-am-7600ce26d35c4e57aac5d98a83d07b5c" into sc-dev-plus-aosp am: 6a4f51f3 am: 5f6ac769 am: bdd68b01

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

Change-Id: Iacf07e1c65867e68d70a9914c20b01be8bc2513f