Merge "Add test for USAGE query for >32-bit" am: 4ef9f5dd2b am: a1171f30d8 am: 0284fd727c

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

Change-Id: I81d2669f98a9716acb638d632cfb28442b122add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>