Merge "Remove catch clause on compat shim" am: 5b37955322 am: 19122edbc5

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

Change-Id: I962a30ce497292d4bc65d6724251d2a16a98d995