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

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

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



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