Merge "Use completeExceptionally instead of second future" am: da294fc886

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054246

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