[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
am: a1c78f8d -s ours
am skip reason: change_id Idb67fb7676adf9e1158113e7b8b08e655f470920 with SHA1 7af1fd03 is in history
Change-Id: I913abc6f7327438bf77fd7ca96c4685797cf8517