Merge changes from topic "am-096d4608db2449ab836588334ba538ee" into...

Merge changes from topic "am-096d4608db2449ab836588334ba538ee" into tm-d1-dev-plus-aosp am: ba6daf29 -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 62845d9a is already in history

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



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