Merge "Allow Privileged apps to read prefered data state" am: 17ed973b1b
am: 8458831e6f

Change-Id: Ib04325b3737337278be8d844fd7d5fb7a8443e63