Merge changes from topic "presubmit-am-d1c37f7c8ffe48118be3df49e87a3a61" into...

Merge changes from topic "presubmit-am-d1c37f7c8ffe48118be3df49e87a3a61" into sc-dev-plus-aosp am: 946a892a am: 1bfc4453 am: 096bd3fa

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

Change-Id: I681448a79c917fa2320223dc84d5df7c4077ff5f