[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am:...
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: 7ab0782a am: 60b39fce -s ours
am skip reason: Change-Id I864084d96600ca5d88a3afd354d1091ee4cef176 with SHA-1 1e3c2baf is in history
Change-Id: I05a9c357b57ba17484ed52d08f9292543ce9c972