Merge "Restricting AndroidTV Remote Service UUIDs' access"
am: 4da763530a

Change-Id: Iab8d61e213150f9d2b686a21776399da9cba09ee