Merge "Swap the order of disabling data roaming button" into oc-mr1-dev am: dfa817a4ab
am: affbd89dcf

Change-Id: I235a6a23ad06f1a14cf3a1d5ff187f0eff792896