Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc173 am: a1eddb7c62 am: ab893f1748

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

Change-Id: Iaf06884959bcb99aa15577415975a4cc4bd78869