Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: f15d33e2f9

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

Change-Id: I2b02c986fee75c254bef6a5ca1f3293bb46f2a16