Merge "Check Cellular support before CarrierServiceTest." am: ed3d0d8df2
am: 3b392bfcea

Change-Id: If5dbb65ce01ca1d5621a70e3964bf2537d2d7125