[automerger skipped] Merge "5G meteredness for telephony framework" into...
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca2 -s ours am: 13ee012d -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281 is in history
Change-Id: Idb067bc391a46440b1cbd2ae3662a1f41cb8270c