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

[automerger skipped] Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev am: 442cffc1 -s ours am: d1174b2e -s ours am: 8c0490b7 -s ours am: 8cf2ebbc -s ours

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

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

Change-Id: I4494424300b46159120c840a908703b0d0e8c06b