[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
am: c21d0ca1 -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281 is in history
Change-Id: I51e4aff47437458ad69127cb0b1d382a7d6a684f