Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into android12-tests-dev am: 80effeeac9

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

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