[automerger skipped] Merge changes If537a25e,Iee14d6ee,Iac718a6a,I0aae9bb4...

[automerger skipped] Merge changes If537a25e,Iee14d6ee,Iac718a6a,I0aae9bb4 into tm-qpr-dev am: 36a9b7e4 am: c2bd56b2 -s ours

am skip reason: Merged-In If537a25e75be963ef5871a0383230d2ab13ff85a with SHA-1 018d4534 is already in history

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



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