Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into...

Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into tm-d1-dev-plus-aosp am: d49c69dc -s ours

am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d850458 is already in history

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



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