Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into android12L-tests-dev am: 5b935518c3

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

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