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

Change-Id: Iff0c19a5e8837b91ea67f16f990bb7250dcc6e9e