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

Change-Id: I04ce338f871b55e6b19de016dad1e2f0a87f833c