Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into android12-tests-dev am: e30b026c00

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

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