[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am:...
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e am: 9e040a11 -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f985 is in history
Change-Id: I2033fbcb16219688c47bd4ff0838953c1f4b1b7a