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

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

Change-Id: I4e8da2388b64aaf6504b6f49dc3570da9833a3e9