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: I6351bd9e71faef03e349cb2820ffdc53ba75d2bc