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

Change-Id: Ieb333e8c2656f90de3712c9974875ee63cb6cdf6