Merge "Fix R8 full mode for Tethering" am: 498919b44c

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

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