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

Merge changes from topic "am-4c397c3fdf114020970b081e27d88ddf" into tm-d1-dev-plus-aosp am: 3b5a6e1b -s ours

am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c4026 is already in history

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



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