[automerger skipped] Merge "5G meteredness for telephony framework" am:...
[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22 am: dd1c7d0a -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281 is in history
Change-Id: I9b54d37c262a0b25a044daa3372432793595c15a