Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev