Merge "Change error and none messages" into rvc-dev am: 695deeae89 am: 43b15b0f68 am: 82487ffae4

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

Change-Id: Ibaa3ebedd7c14414148548a121b8718aa0a27cea