[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: 0b7efca5 -s ours
am skip reason: Change-Id Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9 with SHA-1 92860a70 is in history
Change-Id: If912092714e062e53a6bd581315a5bbeb9420c79