Merge changes from topic "b/262254794" into tm-dev am: a79341e0

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



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