Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-dev-plus-aosp am: aff179b0

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

Change-Id: I4f3e711e25a89793623c891ccc7a057485e2f825