[automerger skipped] Merge changes I01e773cc,Ia599fed8,I7ee32103 into...

[automerger skipped] Merge changes I01e773cc,Ia599fed8,I7ee32103 into tm-qpr-dev am: 4d5cc519 -s ours am: 581b8cac -s ours

am skip reason: Merged-In I01e773cc15eb1ae5ffaa12aef124bbbf390cc004 with SHA-1 89ca8b30 is already in history

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



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