[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 -s ours
am skip reason: Change-Id Ib99e68d5ae47fa27e12428f9a60a2c1204ac59a2 with SHA-1 c7c6a4ac is in history
Change-Id: I8f05b2bc6914fac024513c455ed800ce5578f494