Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into android12L-tests-dev am: f84b535bf1

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

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