Merge "Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am: 50d25dc0 am: 5d55b726" into oc-mr1-dev-plus-aosp