Merge "Backfill VTS owner information." am: f78f24e2fe am: d474afd214

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

Change-Id: Ia9e1ed91552c72f625756779dc5dde783b750c8c