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

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

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



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