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

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

Change-Id: I91d4aef3cfa89e453d88f0fd29866fb007056c7c