Merge changes from topic "presubmit-am-05c1ffc57ea7472e8f99038bc0424cc2" into...

Merge changes from topic "presubmit-am-05c1ffc57ea7472e8f99038bc0424cc2" into sc-dev-plus-aosp am: def69fa1

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

Change-Id: I202b6ea8e6bf826a4711e35b9c967d7d54eba19a