Merge "Allow carrier-privileged apps to access {get,set}MobileData."
am: 579dc129cf

Change-Id: I3b4e25c6ff830f62aec1b53426bfa5f03ae1c4d9