Merge "Update ConnectivityManager javadoc" am: 9e8162c6e0 am: 5eaf68e0e1

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

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