Merge "Adjust SF owners" into main am: fc15483a9a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3027529

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