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