Merge "TEST_MAPPING: vts_treble_vintf_*_test" am: 432717e309
am: f65c312af9

Change-Id: I947ffdd2c9d5da1dc92e10752dd9ac887ca7a761