[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: 8646f0eb5e am: 2524918a8f am: 246bbd4016 am: 384a0f528a -s ours am: c609fb74b7 -s ours

am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 5b6688cee2 is in history

Change-Id: I56cf9fad2fa3f1b023a34420b7df7046ee1bee2b