Merge "servicemanager: guaranteeClient on wait register" am: 0206fed4 am:...

Merge "servicemanager: guaranteeClient on wait register" am: 0206fed4 am: 89d9dc74 am: 9c14937a

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



Change-Id: I6e111a8627419abba4d1841d131dba975000c022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>