[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L54500000958972424:N52900001344436566" into tm-qpr-dev-plus-aosp am: 5c5e56ff -s ours am: f1a1fd65 -s ours

am skip reason: Merged-In I47ce9fdf5429795cbf083516c19b669bc407d1da with SHA-1 d98e95c7 is already in history. Merged-In was found from reverted change.

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



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