[automerger skipped] Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc1 am: a1eddb7c am: ab893f17 am: 6480dd22 -s ours

am skip reason: Merged-In I1f40de5ee559a6d703806e74d305267bde295dcc with SHA-1 5e7b8533 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875736

Change-Id: I57e0016bd1543e260e0e6a0a6f462e9501520d56