[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6f am:...

[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6f am: caf6ede5 -s ours am: a3e98a69 -s ours

am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cd is in history

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

Change-Id: I81d83289d2daf8a13677c0aba58e81cfcb587656