[automerger skipped] Merge "Update CapportData in CapportApiProbeResult to be...

[automerger skipped] Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev am: 442cffc1 am: 4412473e -s ours

am skip reason: Change-Id I99cbff2eb1a9ab87a42011038d911fe15e7344a4 with SHA-1 aa55058c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11790986

Change-Id: I219e3a16ba6e0b1161042989b2de66a584cf924d