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

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

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



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