Merge changes from topic "am-58ca7d8a2c394672818c16262cc7b67b" into android14-tests-dev am: 8961961b84 -s ours

am skip reason: Merged-In I401b091e27e7b3ae86f003a270b53be4060c922f with SHA-1 b347fdbef6 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049052

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