[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c
-s ours am: 13ee012dce
-s ours am: 1a37fd26fa
-s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: Ic80faddb5bfb1beaf7ee505f9fa98ce2c2740897
This commit is contained in: