Merge changes from topic "presubmit-am-8b92d80a5ddc4f80a73dac54933ad702" into sc-dev-plus-aosp am: 61fe5aa1

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

Change-Id: I731d9dbd2d276452c666dbdaa77bbe510e2ea1d5