[automerger skipped] Merge "Improve the performance of displaying preference -...

[automerger skipped] Merge "Improve the performance of displaying preference - multithread." am: 01eeece2 am: bf44d4ee am: b85a4548 am: a59338f4 am: b0bcaf6f -s ours

am skip reason: Change-Id I33be3fab9eb470b48c0d0870d4c03cdaecbac334 with SHA-1 902d5ee7 is in history

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

Change-Id: Ia894b202b033e4a9710f7bf582e816f93fdda125