[automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in...
[automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: 4600fa52 am: af15704e am: 4760b8ad am: 795b460c -s ours
am skip reason: Change-Id Ib99e68d5ae47fa27e12428f9a60a2c1204ac59a2 with SHA-1 4600fa52 is in history
Change-Id: I332dfcbafec5a210003b29d7d34fbf164e6f4dbf