Settings:Appops:remove OP_WIFI(BLUETOOTH/DATA)_CHANGE from MEDIA_TEMPLATE

Change-Id: Ie587d73916802aa85f91bafd8756a6bf9549f2fc
Settings: Only show mobile data switch on preferred data sub

Change-Id: I7f997c82556d719cc39d5f6b95b5122375d6e585
Merge branch into kk_mkt