Merge "Call onServiceConnected only after callback is saved in the service." into udc-qpr-dev am: eb9b233d80 am: 59efa3051c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24257605

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