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

Change-Id: I7f2587af0890b86c55792daf410dbe2b1128c1ca