Merge "Revert "vts_treble_vintf_test: fix test error message."" into pi-dev
am: c124ac338a

Change-Id: I53e4837884b2c994b71a33971e049c297829cc0d