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

Change-Id: Ie3a8584e06bd90c700574f67ec8df6cd3afb4f60