Merge changes from topic "am-920db2a13e4a4678b51b6f69a93a73ee" into android15-tests-dev am: 6fb597e6d1 -s ours

am skip reason: Merged-In I271668e83aed239107b9129dfb707f03bae47cfa with SHA-1 f5c9a65046 is already in history

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3394596

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