Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into...

Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into tm-qpr-dev-plus-aosp am: 3877dc83 -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: Ic92358fe2700b4d93076fc2e5830b880bfbe829a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>