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