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

Merge "Remove ambgiuity in format specifier" into main am: 321f0989 am: a345e5a8 am: 30c57e08 am: 724eb008 am: 50aa99c3

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



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