[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp

am: c21d0ca119 -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee is in history

Change-Id: I51e4aff47437458ad69127cb0b1d382a7d6a684f
This commit is contained in:
Sarah Chin
2020-01-10 11:26:08 -08:00
committed by android-build-merger

Diff Content Not Available