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

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

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