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

Change-Id: Icbc4c95ebb4337d5c5b371e2fc7fc893e86cfe17