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

Change-Id: Iad2482b4599ce9d2c21baf9359cbacd5fff9a88f