[automerger skipped] Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev am: 442cffc1 am: 4412473e am: cc94da9a -s ours am: 20cfdcd0 -s ours am: 05ba25ef -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: If99195111a6a2378356962f7240a2ccbaabc7ef4