Merge changes from topic "am-0a6eb7dd742f403dac2080560719061d" into...

Merge changes from topic "am-0a6eb7dd742f403dac2080560719061d" into tm-d1-dev-plus-aosp am: f3bcf9ab -s ours

am skip reason: Merged-In I5d2270b8341c0405bf256c417acff4279c6b8754 with SHA-1 bd2af08b is already in history

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



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