Merge changes from topic "presubmit-am-57d52d57ff4341f4a6a8262caebf7e00" into...

Merge changes from topic "presubmit-am-57d52d57ff4341f4a6a8262caebf7e00" into tm-qpr-dev-plus-aosp am: d7f491f7

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



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