Merge "remove duplicate jni include" am: 918b56c96d am: 49cbeae43b am: 220fe19be4

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

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