Merge changes from topic "presubmit-am-902b4a010a85419caf0dc4cf949d2c72" into sc-dev-plus-aosp am: 5718bb4a am: 45cc4ec5

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

Change-Id: I21eee0d3c5f8fc44b30c075549de92ac9d56a965