Merge "s/master/main/" into main am: a01b292ab9

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

Change-Id: I3f82591d192b7acc287328e689b338c5d599ca1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>