[automerger skipped] Merge "Add mcts tags This is cherry-pick of aosp/2882146 aosp/2880548" into android14-tests-dev am: 3ae299baa0 -s ours

am skip reason: skipped by liutongbo

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

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