Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into android12L-tests-dev am: eec4191010

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

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