Merge changes from topic "am-1342c267f96a48ea8d8beefd06799660" into...

Merge changes from topic "am-1342c267f96a48ea8d8beefd06799660" into tm-qpr-dev-plus-aosp am: 187a5c0e -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b is already in history

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



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