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

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

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