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

Change-Id: I0199a0eb6656ea7d2c4f6270941b576482d0e53f