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

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

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