[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into...
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 6497ad1b -s ours
am skip reason: Change-Id I864084d96600ca5d88a3afd354d1091ee4cef176 with SHA-1 1e3c2baf is in history
Change-Id: I922357e94eaa7ed27bfa6c4acaaa6ace234d5030