Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into...

Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into sc-mainline-prod am: f5e6f408

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

Change-Id: I9f3f96a779fd306d3ae20f6038e746402763b1f0