Merge "[Settings] Add more code reviewers" am: 709add03c2 am: ebbe31525c

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

Change-Id: Ib182af2271acbc430d0ff4ba1ed87ff24bb1b9bd