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

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

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