Merge "Update OWNERS for Android Settings" into main