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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6dc40fffffaa92897d1cd5e04ee3a4fd99b932