[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: b50cb883b5 am: 20a1e9943d -s ours am: 5107b366b7 -s ours
am skip reason: Change-Id I5c3514bc8ea61d1bbbf1d1bf7e466a319046fb97 with SHA-1 3ab296d073 is in history

Change-Id: I8e077709c16a79dbd4617a4530d1a41226544cec