Merge "servicemanager: guaranteeClient on wait register" am: 0206fed4eb

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

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