Update Settings OWNERS file

Bug: 307628548
Test: N/A
Change-Id: I5c417064cc0a66c191d8eee295b5b8f164e35787
diff --git a/OWNERS b/OWNERS
index 69ae4f9..6698752 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,27 +1,29 @@
+# Bug component: 27091
 # Use this reviewer by default.
 android-settings-core-eng+gerrit@google.com
 
-# People who can approve changes for submission
+# Android Settings Core
 cantol@google.com
 cechkahn@google.com
-chaohuiw@google.com
 chiujason@google.com
 dswliu@google.com
 edgarwang@google.com
-hanxu@google.com
 jiannan@google.com
 millchen@google.com
-songchenxi@google.com
-songferngwang@google.com
 sunnyshao@google.com
+yantingyang@google.com
+
+# Android Settings extended
+chaohuiw@google.com
+songferngwang@google.com
 tomhsu@google.com
 wengsu@google.com
-yantingyang@google.com
 ykhung@google.com
 
 # Emergency only
-wangqi@google.com
-yanglu@google.com
+cipson@google.com
+hanxu@google.com
+yangfan@google.com
 
 # Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
 per-file res*/**=*