Merge "Use assertFailsWith to verify exception cases" am: f9e014317e

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

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