Merge "Update OWNER list" am: f846e5cf0e am: 3e1e67aa9c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2396592

Change-Id: I63122f5b2809224e7f8ff36adc31c1f1595de24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/OWNERS b/OWNERS
index 80138ff..93e04a7 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,13 +3,20 @@
 
 # People who can approve changes for submission
 arcwang@google.com
+chaohuiw@google.com
 chiujason@google.com
+cyl@google.com
 edgarwang@google.com
-emilychuang@google.com
+llz@google.com
 millchen@google.com
+songchenxi@google.com
 stanleytfwang@google.com
 sunnyshao@google.com
 yantingyang@google.com
+ykhung@google.com
+
+# Emergency only
+lijun@google.com
 
 # Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
 per-file *.xml=*