Merge changes I37903e2f,I4e47c746 into main am: 50cd112f1b

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

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