Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into...

Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-dev-plus-aosp am: 14132527 am: d74c4cb7 am: 13019117

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

Change-Id: If8482ab94d75a23722cbff26cfa9774321577ef3