Merge "Nicer share target for default print service" into rvc-dev am: a3040ca8df

Change-Id: Ic2c9f7602c1372f3d1be5603f3dd7d5fa9524862