[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L01300000960051069:N96900001359941510" into tm-qpr-dev-plus-aosp am: 7999a357 -s ours am: eb95697e -s ours

am skip reason: Merged-In Id6e2b127f44f5e553ff7ac4ba640fd4f6f4698b0 with SHA-1 b7bc5640 is already in history

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



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