Merge "Backfill VTS owner information." am: 7f13389b5b am: 37b659dfab

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1838136

Change-Id: Iebdd8612da2ecaefb62dc9eee9a0510d1b8e59a5