Merge "Update VTS tests so that Mediatek pass more VTS for O. am: b36443a864  -s ours am: 9b84b56003 am: ca7dd0aef9  -s ours" into oc-mr1-dev-plus-aosp