Merge "Merge "Change error and none messages" into rvc-dev am: 695deeae am: 76f6b292 am: b0922843" into rvc-qpr-dev-plus-aosp am: 0b1b9925

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

Change-Id: Ieffbffde0cf8336898ec7457bfb3dbcf440c1ee9