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

[automerger skipped] Merge "[Settings] Code refactor" am: 2410478b am: 43a78331 -s ours am: deb24b6a -s ours am: 2d98b88d -s ours am: c7807d7c -s ours

am skip reason: Change-Id I060e7c880d91a0e5059610c5ceae319d47c19c7a with SHA-1 9bc2f7f8 is in history

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

Change-Id: If1b3efc1fb667fe20ce8588c63f311a5addcc6ae