[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: 459c2317 -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

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



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