[automerger skipped] Merge "Update OWNER list" am: f846e5cf am: 3e1e67aa am: e23a4e09 -s ours

am skip reason: Merged-In I9ab91f21558513b85847d9c513e7d50f9486c6ea with SHA-1 3e620335 is already in history

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



Change-Id: I85107887b4ca75f6caded9a48b0418b5eba898c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>