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

Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into sc-mainline-prod am: 5f22ba54

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

Change-Id: I32d5182f31f073fa92a447514dd2f84f562e6f67