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

Change-Id: I4904f7dcd9db571df0c46770054ab4641f776940