Merge changes from topic "am-67dab64ba59d49968d8e270195107d7e" into...

Merge changes from topic "am-67dab64ba59d49968d8e270195107d7e" into tm-qpr-dev-plus-aosp am: 7195aa36 -s ours

am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391 is already in history

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



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