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

am skip reason: skipped by user levarum

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

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