Merge changes If8861745,I2cd93e4d into main am: 7af9bf092c

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

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