[automerger skipped] Merge "Only run ConnectivityDiagnosticsManagerTest as AppModeFull." am: 1b7351a948 am: 57033b41a3 -s ours

am skip reason: Change-Id Id867b8dcaca758cfeb83009848e1099e900a0790 with SHA-1 7c9d2128de is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1326394

Change-Id: Iea3186e33644f3db72f07d1d5a4ec9c9269b80c8