Merge "servicemanager: use safer ref base semantics" am: fd342995 am:...

Merge "servicemanager: use safer ref base semantics" am: fd342995 am: fa6c8e74 am: 478acb9a am: 9fffeb0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1663087

Change-Id: I9b4b2557a96fadf73ecf4ca9d07a842071828d2a