Merge "Align nsconfig owners" into main am: c9f2c27a am: b9d75f1b

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



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