Print error message am: 7a38f410ad am: c938f616d5 am: e47b5ba63d

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel/+/1612362

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8a917b53d0e5c06bcf283efe8b7689dc90fbe21