Merge changes I8e5d1c46,Ib4a89382,Ifacb006b,I75f2ca4a into main am: 4a3a5c95eb am: f580636974

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

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