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

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

Change-Id: I408a116208fb87e12e2f527969b7f09d8b0e0a57