Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am: 737be111cc
am: ce7fc6c0a1

Change-Id: Ib9927ef0b49a467933bb0a1cd7f9ed3c7ff20748