Merge changes from topic "presubmit-am-a06acefa6477490ebb2f9621b57cedf9" into sc-dev-plus-aosp am: df8a4383 am: 10faec17 am: 96a692e4

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

Change-Id: I08ff6a769295a46dc530e68d473a3d2638b4810d