Merge "Escape '.' in com.android.permission"