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

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



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