[automerger skipped] Merge "Improved data fail cause debug message" am: 78f46dd4 am: 42f8a749 -s ours

am skip reason: Merged-In Ic3a5a64a4e57ed49dd4445ff31018b78e833f73f with SHA-1 81ab8c73 is already in history

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



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