[automerger skipped] Merge changes I48279bba,I3baf29a5 into tm-qpr-dev am:...

[automerger skipped] Merge changes I48279bba,I3baf29a5 into tm-qpr-dev am: 9f999d09 am: 6ad0e159 -s ours

am skip reason: Merged-In I48279bba854e3e6badc530fa485bb46c2097ce44 with SHA-1 0059e51a is already in history

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



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