[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
am: bd4b1ea1 -s ours
am skip reason: change_id I83104fad4662a847c5f0aa1301676298c18e979b with SHA1 16138732 is in history
Change-Id: I2a44b204bd1e6b7ae6b77421033c7cb9bc77afe2