Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-dev-plus-aosp am: 299187bc

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

Change-Id: Idf608eec8c018f4c59128ad1e4eb34ec504ab9e3