[automerger skipped] Replaced link state with link status am: 50b369df am:...

[automerger skipped] Replaced link state with link status am: 50b369df am: 0909daf6 am: 18f40283 -s ours am: a5598c1a -s ours

am skip reason: Merged-In I0d9907d886efe1cf3f9840765c35f660acaa21f4 with SHA-1 deeca16a is already in history

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

Change-Id: Iaccfed47e4aa0cb26c7d66b4e4c870d9e998ec8b