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

am skip reason: skipped by user levarum

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

Change-Id: Icfd49104cef8f5d274cd8a01ea5cc9008e460bc9