[automerger skipped] Separates VTS tests by HAL version. am: fc2b10ec86 am: 755d4ccbe4
am: 466938306f  -s ours

Change-Id: Ic76187acd9dcf265ebaffb381e40a08f0be0f6aa