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

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

Change-Id: Ifc2c21258a1f8b8604ca95241bf09819d2429a7e