Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into...

Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 75883154 am: 3151caee am: a4cd2104 am: b8098fae am: 7d0402f1

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



Change-Id: Ib45fc1b7ab00127448303f95ff32c12e23e77924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>