Merge "Use assertFailsWith to verify exception cases" am: f9e014317e am: 03726fb657 am: 458e54a1fb

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

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