Merge changes from topic "am-d9d6da851d2e44e8945482c5adf00669" into android14-tests-dev am: 07644658

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



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