Merge "5G meteredness for telephony framework"
am: 0262cb7765

Change-Id: Ic8b37a1f0a6899c2648000941f1bd25557179dac