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

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

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