[automerger skipped] Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev am:...

[automerger skipped] Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev am: 337e5497 am: 683bcf75 -s ours

am skip reason: Merged-In Ide7d63a75fed98aabe348821355356c77f00a9ec with SHA-1 d05732f1 is already in history

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



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