Merge changes from topic "am-7d67da27f9ce4ecf871760ea2fa05b1c" into...

Merge changes from topic "am-7d67da27f9ce4ecf871760ea2fa05b1c" into android14-tests-dev am: b9407709 -s ours

am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 d5ffbdfc is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2911926



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