Merge changes from topic "am-b1fbc5a7863d4e6db96189f3b2a8bdd8" into...

Merge changes from topic "am-b1fbc5a7863d4e6db96189f3b2a8bdd8" into tm-qpr-dev-plus-aosp am: 228bd0aa -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c4 is already in history

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



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