Merge "[getService] Only set binder when getService2() succeeds" into main am:...

Merge "[getService] Only set binder when getService2() succeeds" into main am: 33a6e89a am: e2bce803

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



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