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

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

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