Merge changes from topic "am-29e95a298b8f4c7d94bf4fea3b7dd371" into...

Merge changes from topic "am-29e95a298b8f4c7d94bf4fea3b7dd371" into tm-d1-dev-plus-aosp am: 45530e6f -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566 is already in history

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



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