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

Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911