Merge changes I45c335b2,I4d0a1530 into main am: b6aef2658d am: 18e4af95df

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

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