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

Merge changes from topic "presubmit-am-d42aa9966d86454092249b55f0b30895" into sc-mainline-prod am: 9face554

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

Change-Id: Icd5df39585c372d9a145f2e4dee7f1526fb047ec