[automerger skipped] Merge "Add CTS testing for ConnectivityDiagnostics Data Stall callback." into rvc-dev am: 9ce134cf40 am: 577e458982 am: 92731b92f7 -s ours

am skip reason: Change-Id If6ceae9d2bbcabf88298d2d8c39cad5275fbd1ef with SHA-1 d1e42d7e64 is in history

Change-Id: I594f045a85d99db512caa6155af1b3d0ed16279d