Merge "Add null check for tupleOrig in ConntrackMessage" am: 69b6ca4ff1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2574182

Change-Id: Ib6e15089788682fbac4be874d062823152d6bad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>