Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into...

Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp am: 805830f7

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



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