Merge changes from topic "am-98cb14591fd44979b73aaa6fdd3a4e75" into...

Merge changes from topic "am-98cb14591fd44979b73aaa6fdd3a4e75" into tm-qpr-dev-plus-aosp am: 22cefdb5 -s ours

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

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



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