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

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

Change-Id: Idfded0ad796791a3866a3ac7957ad99c19d4f2cc