[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8
am: caf6ede5f7
-s ours am: a3e98a699e
-s ours am: f774cdf0ee
-s ours
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366
Change-Id: I139973afc6f78d0fec44eff9e476c1dbaaac65c5
This commit is contained in: