[automerger skipped] Merge "DataNetwork default handover failure mode to...

[automerger skipped] Merge "DataNetwork default handover failure mode to UNKNOWN" am: 27c003b3 am: 47079463 am: c8bed8a2 am: 77161c36 -s ours am: a1fb6df6 -s ours

am skip reason: Merged-In I502997f15c2a51b55074c1d76b8bb7914c9e7cf2 with SHA-1 319c6204 is already in history

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



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