Merge "Correct javadoc usage" am: b7f81e4a6d am: d2e4c1f915 am: 5f710b13aa am: a09e59da4f

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

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