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

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

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