Merge "[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours" into android12-tests-dev am: f414cb356b

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

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