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

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

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