Merge changes from topic "am-72dc72fe3d2049a29c5e2c45ca7a90dd" into...

Merge changes from topic "am-72dc72fe3d2049a29c5e2c45ca7a90dd" into tm-d1-dev-plus-aosp am: 00cc830d -s ours

am skip reason: Merged-In Idd26d2b4e10dfcd00045184ddd2f9815a02ec7ce with SHA-1 6197f495 is already in history

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



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