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

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

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