Merge "[CTT-2] Clean up unused {function, exception} and improve readability" am: d6ca2420bb

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

Change-Id: Iebbf79ab6e45dbbc9f9523f40c54c1f501244d67