Merge changes from topic "am-75f53628255f457c9a090af3d4875a4a" into...

Merge changes from topic "am-75f53628255f457c9a090af3d4875a4a" into tm-qpr-dev-plus-aosp am: f157e412 -s ours

am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 ab0ee99c is already in history

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



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