Merge "Merge "Fix spectrum-level 5g meteredness logic" into rvc-d1-dev am: b493ec0e am: 93443857" into rvc-qpr-dev-plus-aosp am: 360722ef

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

Change-Id: Ie807cd4f31a9cbdbae4958993a0767f4d4c47921