[automerger skipped] Merge "Improve the performance of displaying preference." am: f0322ab48e
am: 9cc7978d0a
-s ours
am skip reason: Change-Id Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61 with SHA-1 84587b1aa3
is in history
Change-Id: Ic06c42e81cea117038bd4fd015ca8712e582e228
This commit is contained in: