[automerger skipped] Merge changes from topic "preferred_data_profile" am: a9ae304b am: 054849bd am: ecc89b8b -s ours

am skip reason: Merged-In Ie91286a5aa51ea77e74d86fc1c4b7c001bebc0d8 with SHA-1 e19cca29 is already in history

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

Change-Id: I1df2dd628415c820af45fff70c8af5ea24597d92