Merge changes from topic "am-8c71b9798041468abff15d2dd21e2948" into...

Merge changes from topic "am-8c71b9798041468abff15d2dd21e2948" into tm-qpr-dev-plus-aosp am: 13cb24de -s ours

am skip reason: Merged-In I9e1fb108147ffb4c812ea2b94a50d6201eaf008a with SHA-1 d6304602 is already in history

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



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