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

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

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