Merge changes from topic "am-814bd07fbc6b45148064c8aedcfcdaba" into...

Merge changes from topic "am-814bd07fbc6b45148064c8aedcfcdaba" into tm-dev-plus-aosp am: 4df197df -s ours

am skip reason: Merged-In I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f with SHA-1 1b463332 is already in history

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



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