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

Change-Id: I3e07035416c06ff03df52b546b36e4ef4b3ec7a5