Merge changes from topic "I81ece86ace916eb6b435ab516cd431ec4b48a3bf" am: dcbc8ec29a

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

Change-Id: Ibda51d9f321b5bbb4860be054f83bbf7859bc8a3