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

Change-Id: I2169c5d3a0a1d8b4bd6729c4ca56b7a1de2a6249