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

Change-Id: Id3e49ad9ae01110ba3edcc826332195e5d9d624b