Merge "[automerger skipped] Merge "tethering: transitive deps from jni_libs"...

Merge "[automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf078 am: 07074804 am: 6b01f7cc -s ours am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 9618b66f is in history" into rvc-qpr-dev-plus-aosp am: 0e464c0e -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 55d9376f is in history

Change-Id: Idaa66e79c6f1fa6433058b38f6d30d28a58fd1df