Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev