Merge "Consistent reporting of failure conditions" into sc-dev am: e8331326 am: d5a0d8d0 am: b0a0f750

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

Change-Id: I728f60dd0e9973c020f5f373a9ad09609f2b2f0f