Merge "Merge "Align nsconfig owners" into main am: c9f2c27a am: b25af6fa"...

Merge "Merge "Align nsconfig owners" into main am: c9f2c27a am: b25af6fa" into udc-qpr-dev-plus-aosp am: 4b8d2bd0

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



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