Merge changes from topic "presubmit-am-d1c37f7c8ffe48118be3df49e87a3a61" into sc-dev-plus-aosp am: 946a892acb

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

Change-Id: I3cdc077a105f2895cefd056e08842d3bcf5c8b32