Merge "Remove ambgiuity in format specifier" into main am: 321f0989e5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765005

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