Merge "Skip some permission test cases on TV devices" am: b464034d80 am: 0e70464a1a
am: f4c4d3e60a

Change-Id: I3d6352d7d12248ce1b9fc18b6f5042a810ec9475