Merge "Change error and none messages" into rvc-dev am: 695deeae am:...

Merge "Change error and none messages" into rvc-dev am: 695deeae am: 43b15b0f am: 82487ffa am: 6588c43f

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

Change-Id: Ib2b71e25169efa4c461c405093c94666b3cc4456