Revert "DO NOT MERGE: Add API to indicate carrier networks."
am: d3d5cb4645  -s ours

Change-Id: Ib3f0dd6b10eeb94032cca51371db753dd8ed9bb9