Revert^2 "Fix flakes due to tests resetting CarrierConfig"

This reverts commit 19a936d3ab793b793d5e29e28cb9ba794eafb564.

Reason for revert: revert^2 to verify if this CL really break TH.

Change-Id: I8600883785881d857b7e79cf16459e33080fa82b
4 files changed