Merge changes from topic "am-ab6eba06ba694c37b36a5aafe16c8c9a" into main am: b37b29d04f -s ours

am skip reason: Merged-In I3524c95f20bee565d1f5ec94468b62e625aa1776 with SHA-1 08fc8bd525 is already in history

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

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