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

Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-mainline-prod am: dcddfde2

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

Change-Id: Ie1ea08a6e75f8799def62442af3614512b42c363