[automerger skipped] Stick with perferred data profile am: f7f8f7ae -s ours...

[automerger skipped] Stick with perferred data profile am: f7f8f7ae -s ours am: a074e0e5 -s ours

am skip reason: Merged-In I9b8ae99c3fa6846a4d5648f4383f22402dc5118b with SHA-1 6426e5d6 is already in history

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



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