Merge "Fix error message formatting" into main am: 15a2601cc9 am: 56092cea7a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2753145

Change-Id: Ia74ac90b6f4fb44e1a56dbbef6e5bf25966117d9
Signed-off-by: Automerger Merge Worker <[email protected]>