Merge "s/master/main/" into main am: b533f531df am: 5cc875126a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

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