Merge "Update VTS tests so that Mediatek pass more VTS for O. am: b36443a8 ...
Merge "Update VTS tests so that Mediatek pass more VTS for O. am: b36443a8 -s ours am: 9b84b560 am: ca7dd0ae -s ours" into oc-mr1-dev-plus-aosp
am: 2ca94435 -s ours
Change-Id: If994713a29372c975ca9811c58c76956780fc3d8