Merge "Merge "Add dataFailCause existence check" into tm-dev am: 9525088a am: a00318f1" into tm-d1-dev-plus-aosp am: 62c1c0e5

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



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