Merge "Correct javadoc usage" am: b7f81e4a6d am: be47310f5b

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

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