Merge changes from topic "am-77a3b54365744c28b98751b439776b01" into main am: 55aebf3312 -s ours

am skip reason: Merged-In Iade578a1cfabc37a0acfb3488f225eaaf9c6536c with SHA-1 618ce1b386 is already in history

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

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