Merge "Don't Skip CellInfoTest when only camped for Voice" am: 6fb23df8a2 am: 4891a713b9
am: dbcb196d6a

Change-Id: I2f276f4a48ded792816e9caedf1d8642b91d6057