Merge "Improved data fail cause debug message" into tm-dev am: e821fd30

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



Change-Id: I2b614acab130c1568eb27c34017d27a98fee1903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>