[automerger skipped] Merge "VTS for UsageSetting" am: 350d762b am:...

[automerger skipped] Merge "VTS for UsageSetting" am: 350d762b am: a983f879 am: 85455e44 am: bbd2302b -s ours

am skip reason: Merged-In I26a68d4b6be4810fab9302b58a3be7f65fc82c83 with SHA-1 244423c7 is already in history

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

Change-Id: Ic01c6ebf31f3c607f2fe3c27872bbd20bafa45f2