[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: 0c6549f991
-s ours am: 5d20e899f8
-s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 20974b6814
is in history
Change-Id: Iaff04cb1dc1f69c19c9a490dd3b474babe09fa8a
This commit is contained in: