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

Change-Id: I91925da75262c8980d27e3e33f5822aa0b4495b4