Merge "[Settings] Fix CellDataPreferenceTest" into rvc-dev am: ef2e319347
am: ec80b6da3a
am: ba5ac7f0e0
am: c43b9b1a6d
Change-Id: I591594f581e9a1e5b64dba0191b94dabfae28ad0
This commit is contained in: