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: f7f0bf54 am: 5d3c4c5a am: d6b10086 am: e973c3cf am: a877ca2a

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



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