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