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

Merge changes from topic "am-be1b2c1bac4347ebb6462994efbfdb74" into tm-qpr-dev-plus-aosp am: f74236b4

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



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