Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b am: 05438dbcbd

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

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