[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff am: dd1c7d0a8a -s ours
am: 875ac6925a -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee is in history

Change-Id: I88005f5f4d077db75f95d495be3c0b781cfa066f