[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 skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: I5a36d3638d011b4e086efd53e6c5b9fed70dfc9c
This commit is contained in: