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