Merge "Permissions for odrefresh and /data/misc/apexdata/com.android.art"