[automerger skipped] Merge "5G meteredness for telephony framework" am:...
[automerger skipped] Merge "5G meteredness for telephony framework" am: aaba3602 am: aad2183c -s ours
am skip reason: Change-Id I83104fad4662a847c5f0aa1301676298c18e979b with SHA-1 50c3b53c is in history
Change-Id: I9ad4a644105fea5013bbef97ef227a436ad73a69