Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev
am: 4dc2938418

Change-Id: Ic08fbf1610140c9c60d1c91b9960b62304e1d6be