[automerger skipped] Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 am: b85a454835 am: a59338f4be am: b0bcaf6fea -s ours am: 2810a5aa63 -s ours
am skip reason: Change-Id I33be3fab9eb470b48c0d0870d4c03cdaecbac334 with SHA-1 902d5ee79c is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637
Change-Id: Ie0b7c412c340bdab7acccd8e09872481465dd6ce
This commit is contained in: