Merge "Avoid using a format for the usage param in consumer test" into main am: c543fd21bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3309046

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