Merge changes I3ba1e899,I62cbf638 into main am: 5348da0e16

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

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