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

Change-Id: Id75a6b9f504b01959fab35ef9854719226be70e0