Merge changes I20ba5186,I6f3e29ca into main am: d025430d24 am: f865052027

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

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