Merge "[Settings] Add more code reviewers" am: 0a5d323e am: bcce3d18

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2505560



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