Merge "Merge "Align nsconfig owners" into main am: c9f2c27a0e am: b25af6faaf" into udc-qpr-dev-plus-aosp