[automerger skipped] Merge "5G meteredness for telephony framework" am: 0262cb7765 am: e4bf049e31 -s ours
am: c85afb5bfd -s ours
am skip reason: change_id Idb67fb7676adf9e1158113e7b8b08e655f470920 with SHA1 7af1fd0376 is in history

Change-Id: I0845616dc6558509324207297ac514f45168418a