Merge changes from topic "am-7555b5787ba0475ead51afd7776f3a0c" into...

Merge changes from topic "am-7555b5787ba0475ead51afd7776f3a0c" into tm-qpr-dev-plus-aosp am: 0c61b2fa -s ours

am skip reason: Merged-In Idd26d2b4e10dfcd00045184ddd2f9815a02ec7ce with SHA-1 6197f495 is already in history

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



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