Merge "Remove ambgiuity in format specifier" into main am: 321f0989e5 am: a345e5a848 am: 30c57e0825 am: 724eb0086c

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

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