Merge "Disable the charge popup when the roaming is turned ON"
am: e6fcfba051

Change-Id: I108d0c108f1eedb2fe7bb5776dfa021d087e95a4