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

Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: ebfd4af8 am: dfa6e05a

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



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