Merge "Update APIs based on API review feedback" am: 5d4e9ee83d

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

Change-Id: I3e2943633d520579dab8e2056fdd04e9e11448e1