[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: 7ab0782aca am: 60b39fce31 -s ours am: b0c9d30103 -s ours
am skip reason: Change-Id I864084d96600ca5d88a3afd354d1091ee4cef176 with SHA-1 1e3c2baff7 is in history

Change-Id: I3a28e8aab09ab4c352789cc98ed6c3f7522576e2