[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 319e862471 -s ours
am skip reason: Change-Id I5c3514bc8ea61d1bbbf1d1bf7e466a319046fb97 with SHA-1 3ab296d073 is in history

Change-Id: Ie4f4e7795f922d4b663c7fe21fe9781d76431375