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

Change-Id: Ib4ebd8ed3605de40b974a8a1417f0a8bac31d1e6