Merge changes from topic "am-1f298d98da324175bda335053180c31b" into...

Merge changes from topic "am-1f298d98da324175bda335053180c31b" into tm-d1-dev-plus-aosp am: 9dc3a8c0 -s ours

am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b3 is already in history

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



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