[automerger skipped] Merge "TEMP_NOT_METERED only for 5G override" into...

[automerger skipped] Merge "TEMP_NOT_METERED only for 5G override" into rvc-qpr-dev am: 4a3c758e -s ours

am skip reason: Change-Id I50d3dabffe5e62f56c5958afe8adb194444594a6 with SHA-1 5b493083 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3f081fa26150bcfc11efc3c39bba8bd737b9020