Merge "Handle 5G meteredness in telephony framework"
am: f7d2691e1e

Change-Id: I605c523ba16df57df339f2c68c330299caa4b3b5