Merge changes from topic "am-3d0ccbdc4ffb41f4bef245a13704911c" into...

Merge changes from topic "am-3d0ccbdc4ffb41f4bef245a13704911c" into tm-d1-dev-plus-aosp am: c097e549 -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: Iaecbe7db97016e50dadb4240dd4fa0570e48755c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>