[automerger skipped] Merge "Avoid using a format for the usage param in consumer test" into main am: c543fd2 am: 17536ea -s ours

am skip reason: Merged-In I492a25eededac60f835831390de037bdc5f4eac7 with SHA-1 72ddb9c is already in history

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

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

Author: Treehugger Robot