Merge changes from topic "presubmit-am-60b4d1c1b726424abd201475fc103765" into...

Merge changes from topic "presubmit-am-60b4d1c1b726424abd201475fc103765" into tm-qpr-dev-plus-aosp am: 009c0791

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



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