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

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

Change-Id: Ib60bd525570c7c47395df2d451daa22434507a53