Merge "vts_treble_vintf_*_test in test mapping."
am: d217fa56a2

Change-Id: Ieabb30094fca40ec3e765c7aae7c97e0273e6bee