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

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

Change-Id: Ic1513fcfb4b2b7f4a25f2dc33234fcb06d9d27f4