Merge changes from topic "am-ef2851dec5b94ff89d4e58c2786f49d9" into...

Merge changes from topic "am-ef2851dec5b94ff89d4e58c2786f49d9" into tm-d1-dev-plus-aosp am: 12d0f5d5 -s ours

am skip reason: Merged-In I13a0202b25c8118db47edba11a93c1939c94b392 with SHA-1 b6b2906e is already in history

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



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