Merge changes from topic "am-9219af63be8245859497f6ec8f96b7a8" into...

Merge changes from topic "am-9219af63be8245859497f6ec8f96b7a8" into tm-d1-dev-plus-aosp am: dec7afe4 -s ours

am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d62 is already in history

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



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