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

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

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