Merge changes If8861745,I2cd93e4d into main am: 7af9bf092c am: 8ee3ff2ef5

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

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