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

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

Change-Id: I720c0d7ac8a15e006ef6714e98d70b684254fb09