Merge "Consistent reporting of failure conditions" into sc-dev am: e8331326 am: c43e154a am: 6a1c704e

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

Change-Id: I812a8ead3f2c0be9858b70a8b91b2ab5c33f3dbb