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

Merge changes from topic "am-e1ce824f0c59415695ed6b6d3ade45ca" into tm-qpr-dev-plus-aosp am: e83f68b5 -s ours

am skip reason: Merged-In I2ec5fd036af1d35c6d3fe000ee41f3347f9aea41 with SHA-1 8914ae87 is already in history

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



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