Merge "Fix error formatting issues" am: cd95e9fa3b

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

Change-Id: I4fdf71f667af2ab6f2276d53b210a892e1fca912