Merge "VTS for UsageSetting" am: 350d762bcc am: a983f87907

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

Change-Id: I63b7a3e06b6d2690e799ec88f6be18d8baff3519