Merge "DO NOT MERGE - Merge ab/7272582" am: a882cb5d43

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

Change-Id: Iefafb69fbeb3cabbb9ead86ec38995a212c38929