Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd am: 2f5ce95057

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2