Merge changes from topic "presubmit-am-902b4a010a85419caf0dc4cf949d2c72" into...

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

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

Change-Id: I79f7fb495fe883e833927f15112aca7210e8687c