Merge "Merge "[Settings] Fix CellDataPreferenceTest" into rvc-dev am: ef2e319347 am: e02ffc7b7d" into rvc-d1-dev-plus-aosp am: c0111ca658 am: 8263cd3408
Change-Id: Ibeb762061c4acb8029cdffbdcb95a6ea6db517c2
This commit is contained in: