Merge changes from topic "am-688ec2c9e39a42e4999c3d7e7867acca" into...

Merge changes from topic "am-688ec2c9e39a42e4999c3d7e7867acca" into tm-qpr-dev-plus-aosp am: d6f98b3f -s ours

am skip reason: Merged-In Ia95a76f86cf4c38bf89e56f954dbf59e0083ec50 with SHA-1 f0f1fb99 is already in history

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



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