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
am: 2ca9443562  -s ours

Change-Id: If994713a29372c975ca9811c58c76956780fc3d8