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