Merge "5G meteredness for telephony framework"
am: 5ce99e22ff

Change-Id: I5f516f7ba5b4e0ec24283c4b555d4a5ff9ae2ea6