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 am: e270bcb9 am: ff4236f3

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



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