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

Merge changes from topic "am-baa68264200d4616baa454f231e54eef" into tm-d1-dev-plus-aosp am: dacbb434 am: c6549e95

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



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