Merge "servicemanager: rely on auto unlinkToDeath" into stage-aosp-master am: f881941614
am: d09f7faef3

Change-Id: I3007860fee271305e648fc156a04967a58622dfd