[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e
am: 9e040a1198
-s ours am: 58e5e9966a
-s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510
is in history
Change-Id: Ib8511b2056c8f00ff98a5b8b1336d6cc50e0a955
This commit is contained in: