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>