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

Change-Id: I3b7706b9d730718ca46eb3ec16a04ac951c9f44b