[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours am: 6930e2adc0 -s ours am: b556a1c812 -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814 is in history
Change-Id: I3c291c9975a697364570204c642c42dc5a391f6d
This commit is contained in: