Merge "Add aconfig namespaces to sync to sys prop" into main