Merge changes I45c335b2,I4d0a1530 into main am: b6aef2658d

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

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