Merge "[CTT-1] Rename conntrack related function, variable and constant" am: 2c2eccac73

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

Change-Id: I9da178744d3a276ac3a26058eb5fd95240882beb