[automerger skipped] Merge "Add dataFailCause existence check" am: 478a6e14...

[automerger skipped] Merge "Add dataFailCause existence check" am: 478a6e14 am: 0f962523 -s ours

am skip reason: Merged-In I7409e40a7b5c1468112938f663c37508a4f3b1f0 with SHA-1 4ef05d50 is already in history

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



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