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 am: cef7e8cd

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



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