Merge "Restricting AndroidTV Remote Service UUIDs' access"