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

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

Change-Id: I3b8eb57970a1756f166ed267876bf73bbc5085fd