Merge "Update UsageSetting Cache before comparison in VTS" am: 630637627f

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

Change-Id: I770fc214ef93e8bc3aea0fb2c1cb5bb160ab2846