Merge changes from topic "am-4212e85279cd4af49081bfd97be33764" into android14-tests-dev am: 6df0a78dd6 -s ours

am skip reason: Merged-In I846cd2bbf1159abf05e9d754c2e96c12912c7d72 with SHA-1 31ec381052 is already in history

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

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