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

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

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