Merge "Avoid String.format in Compatibility.Callbacks methods" am: 51d7d4a108

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1360397

Change-Id: Ieb36518e0aa268ad3b19d043654378003d6e5fe1