Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 75883154 am: 3151caee am: a4cd2104 am: f7f0bf54" into tm-qpr-dev am: e393e01e am: 02ae3247

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



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