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

Merge changes from topic "am-fab4049ffda64cd5920c0666c992abd7" into tm-d1-dev-plus-aosp am: 3fc56bfe -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/+/18590705



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