[automerger skipped] Merge ab/7633965 am: ad19c87f80 -s ours

am skip reason: Merged-In Ic7a83fb01a39113d408ed0c95d27f694d5a2649c with SHA-1 c75fbc7b8a is already in history

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

Change-Id: If48afed66b2c159c6ef27b9e0fde2715a31615b6