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

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

Change-Id: Id889a5ade51d8cc2a9ee533ea3494d7a12f03c34