[automerger skipped] Merge "sensors:2.0:vts fix functional test for...
[automerger skipped] Merge "sensors:2.0:vts fix functional test for typeAsString field" am: e3fc570d am: 1f65d20a -s ours
am skip reason: Change-Id Ib5f8fd513313670e88c2b973c1ff724658914eb2 with SHA-1 908e4479 is in history
Change-Id: I32b54da0c798491fc48b27e5759cd04457a4de04