[automerger skipped] Merge changes Ieadd31ef,I173058d7,I089d37fc into...

[automerger skipped] Merge changes Ieadd31ef,I173058d7,I089d37fc into tm-qpr-dev am: 9465fd4c am: 319f8f1b -s ours

am skip reason: Merged-In Ieadd31efc677b43ce008a3b26726b565e9f497ab with SHA-1 09138ccf is already in history

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



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