[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: 8646f0eb5e am: 2524918a8f -s ours am: 19e2f46301 -s ours

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

Change-Id: Ibe20853073ff6dfc94cf150c25ab796fa764333a