[automerger skipped] Merge "[DO NOT MERGE] Add SHA team into Settings OWNER"...

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

am skip reason: subject contains skip directive

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



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