Merge "sepolicy:policy changes to allow ptt/cnss_diag service to access sdcard"