Merge "Add device identifier permission checks to TelephonyPermissions"