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

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

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