Merge changes from topic "presubmit-am-5c568a4d5fce4fe88f1d10f881151264" into...

Merge changes from topic "presubmit-am-5c568a4d5fce4fe88f1d10f881151264" into tm-qpr-dev-plus-aosp am: d4f8783b

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



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