Merge changes I3ba1e899,I62cbf638 into main am: 5348da0e16 am: 853281094a

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

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