DO NOT MERGE - Merge ab/7272582 am: d8bd5bd28f

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

Change-Id: I0be5c7c9b4717ee3e045e5979700aeeef68b94e8