[automerger skipped] Merge "Cherrypicking the following change to TM QPR."...

[automerger skipped] Merge "Cherrypicking the following change to TM QPR." into tm-qpr-dev am: a237dfdb am: aed20ab0 -s ours

am skip reason: Merged-In I953fe4401d9c8d16398f9d16db0500aed9bf488b with SHA-1 a2fb3f31 is already in history

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



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