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

Merge "Merge "Ensure resultTo callback is always invoked." into udc-dev am: cc3076a8" into udc-dev-plus-aosp am: c519ee4e

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



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