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

Change-Id: I715f892e05d16e55f8bb13c9be5ebbc8013b9217