Merge "Define Bundle keys for ConnectivityDiagnostics."
am: 26216dbc0f

Change-Id: I2a5ac28aea190d06dc2e7e6f8bb9950e0a18e3f7