tree 22739b9d5c7f254c30f7f6c0cfc1971d042ad346
parent c954c1450efad1f8f1d4110b6b4e988ec06314dd
parent 325287407f6a2bb4915a6e1632c36000b04cb37e
author Sarah Chin <sarahchin@google.com> 1578683841 -0800
committer android-build-merger <android-build-merger@google.com> 1578683841 -0800

[automerger skipped] 5G meteredness for telephony framework
am: 325287407f -s ours
am skip reason: change_id Idb67fb7676adf9e1158113e7b8b08e655f470920 with SHA1 7af1fd0376 is in history

Change-Id: I637d82f792f81723baaff852c76e499c1f2a9e68