[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: df94694c42 am: 088c30b5ca -s ours am: 078940e176 -s ours
am skip reason: Change-Id Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9 with SHA-1 e8aa5acef5 is in history

Change-Id: Iaa13c269333d02bdb40c805d2c1306c382575e63