Merge "Stop observing death of PrintManager listener when it is removed" am: e7240a52e2 am: 5cb172d17e
am: 9e3ff42caa

Change-Id: I3d643e52e86bbd4ff9bd588fba51fce82fbb35e9