Merge "Use completeExceptionally instead of second future" am: da294fc886 am: 4b2ca2786d am: d496961799

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

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