Merge "Align nsconfig owners" into main am: c9f2c27a0e am: b25af6faaf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855586

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