Merge changes from topic "am-65f1cfe4989b4fe3a8ee263878ce44fb" into...

Merge changes from topic "am-65f1cfe4989b4fe3a8ee263878ce44fb" into tm-d1-dev-plus-aosp am: 2473d7fc -s ours

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

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



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