Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into...

Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-dev-plus-aosp am: 2c66e4e4 am: 81abd270

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

Change-Id: I9c1476263e7295261deaff7c2c606a4cd87e6f63