[automerger skipped] Merge "Supported minimum aggregated bandwidth and roaming...

[automerger skipped] Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: eede2455 am: 1f3652ed am: ab9c72a2 am: a8673d30 -s ours am: 825bffb7 -s ours

am skip reason: Merged-In I1359fab6f43308e725674089e68b2cd02e5d7358 with SHA-1 22a4fbe4 is already in history

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

Change-Id: I39888ddfee33d9e78b1d2f4ae04097d531b7439d