Merge "Fix error message formatting" into main am: 15a2601c am: 56092cea...

Merge "Fix error message formatting" into main am: 15a2601c am: 56092cea am: cfccabd9 am: bf606855 am: 9d8cef7f

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



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