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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb0d9947c75984e31b21820359de19b8526c72fd