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