Merge "Fix permission checking for IsDataRoamingEnabled"