Merge changes from topic "presubmit-am-bdeb5af3ebb64c3b9d2305a5c57271d2" into...

Merge changes from topic "presubmit-am-bdeb5af3ebb64c3b9d2305a5c57271d2" into tm-qpr-dev-plus-aosp am: bb031e15

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



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