Merge \"Merge \\\"Blacklist ATV Remote Service to never appear on Recents\\\" into nyc-dev am: 8f41c074c7 am: 295322d954\" into nyc-mr1-dev-plus-aosp
am: 51a3f42c9f

Change-Id: I98a23768d09ad1f9e71e28a6857d215d5099b296