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

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

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