Merge "Fix format of helper msg" am: 6e87192cef am: 190bdb1970 am: 7056d6af26

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2767dfa8804368b46dcae17b6684c97853966c4b