Merge "Update UsageSetting Cache before comparison in VTS" am: 630637627f am: af9e5f36a9 am: 5227cdb664 am: 8a5ce406f8

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

Change-Id: I901713e998da0f12a9aa00b12ad5106a64d7b4a1