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

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

Change-Id: I6d4270426be37b83553521c7a44e14c9a4562ed7