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

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

Change-Id: I348f6f29bc09d502cf7c603af30dedca99a1d74b