Merge "sensors:2.0:vts fix functional test for typeAsString field" am: e3fc570d6d

Change-Id: Iec84bed4fe462001a577b382e4934b59b765017b