Merge changes from topic "presubmit-am-902b4a010a85419caf0dc4cf949d2c72" into sc-mainline-prod am: d6e5c599

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

Change-Id: I8a4b0631fe534e87cd31826198eaf2dfa88d7849