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

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

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