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 am: 58885f24 am: c7760314

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



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