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

Merge changes from topic "presubmit-am-ded63539d4274340842bdaa319ef26aa" into sc-mainline-prod am: 564f94ae

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

Change-Id: I4bf4472614f72585b3e258288e2b8f70585a0851