[automerger skipped] Merge "[Settings] Refactor for performance" am:...

[automerger skipped] Merge "[Settings] Refactor for performance" am: 14b0af43 am: c5d5a3d1 -s ours

am skip reason: Change-Id I484cafa739f9e6e58427894712f2bb7e2ed1f4ff with SHA-1 52d7a960 is in history

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

Change-Id: I86f128ff6cf50e09814b7c0dab303c83acc7e365