Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into...

Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-dev-plus-aosp am: 76d2c850 am: 862a43fd am: a422e5e1

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

Change-Id: I62d52c6958b4ec7e5d5148b9571c84c91beabfaf