Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"

This reverts commit 187c9943ff68dd30aac90ec322622eb67813d7ff.

Reason for revert: Slipped off master. Revert and try put it back.

Change-Id: I5823566523346c943c14e91848e7d5de9c14d68d
2 files changed