Merge "[Settings] Code Refactor" am: bafd49d6 am: c31caafb am: 81e86e8d

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



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