Add mcts tags
This is cherry-pick of aosp/2882146 aosp/2880548

Change-Id: Ib4471351be0c72ca680679cc49c1b26e50c1e003
Test: N/A
Bug: 348121429
4 files changed