[automerger skipped] Merge "[DO NOT MERGE] Add SHA team into Settings OWNER" into tm-qpr-dev am: cd68d8f7a3 -s ours

am skip reason: Merged-In I63122f5b2809224e7f8ff36adc31c1f1595de24d with SHA-1 e23a4e09db is already in history

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

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