[automerger skipped] Improved data fail cause debug message am: 633bf342 am: dfbbf680 -s ours

am skip reason: Merged-In Id812faa671c0721b13d317b84790cd6bebcff0dd with SHA-1 e201beda is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2091791



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