[automerger skipped] Merge changes from topic "cherrypicker-L54500000958972424:N52900001344436566" into tm-qpr-dev-plus-aosp am: 5c5e56ffef -s ours
am skip reason: Merged-In I47ce9fdf5429795cbf083516c19b669bc407d1da with SHA-1 d98e95c7c8 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21852902
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22648062
Change-Id: I5cd17c6d6270650e6f574821fac4d2ce5abc6c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: