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

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

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