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: I01afb55026cca2dbd711f18f595f6e083cab5990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>