Merge "Fix error formatting issues" am: cd95e9fa3b am: f9d8fff294 am: 207d64db15

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

Change-Id: I648f68c5ab773b74d6ec716b220858b19c914b92