[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into...
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 0904e65e -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f985 is in history
Change-Id: Ibc41af0d95bd15a2b1a7130374920197898941a6