Merge "Use compile_multilib: "both" for MTS" into main am: 78931a3c91 am: e9213778d4

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

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