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