Merge "Change error and none messages" into rvc-dev am: 695deeae89 am: 76f6b29251

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

Change-Id: If49e88bb96d5a8b88d670e6f3d833f5d5830d68b