Merge changes from topic "presubmit-am-01a5e579a8c54e84a6f02bb53e4352e3" into...

Merge changes from topic "presubmit-am-01a5e579a8c54e84a6f02bb53e4352e3" into sc-dev-plus-aosp am: 413a5b6e am: 6bcb239e am: 074e0609

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

Change-Id: Ibfae563c2929286151d5b602bee6c896535d0381