[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: 8646f0eb5e -s ours am: e71ca7308e -s ours am: bcad35c492 -s ours am: 8ac2412f3b -s ours

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

Change-Id: Ie4fcb04486747d7775c432d043c3b806d052c031