Merge "check-flagged-apis: suppress unused variable warning" into main am:...

Merge "check-flagged-apis: suppress unused variable warning" into main am: c0392044 am: d81c46b5

Original change: https://android-review.googlesource.com/c/platform/build/+/3069746



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