Merge "Ensure resultTo callback is always invoked." into udc-dev am: cc3076a8 am: 80eb783f

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



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