Merge changes from topic "presubmit-am-a06acefa6477490ebb2f9621b57cedf9" into sc-dev-plus-aosp am: df8a438396 am: 10faec1792

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

Change-Id: I7cc6f2039b4fa421294b8911487ab9df251a484e