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

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

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