tree ba5e7c9e2c9712a78721e2e28cdfbedae1bcd843
parent de4117c1cdbb1a8afdb4036968389374779539a0
parent 088c30b5cae4ce1df18fdd91409797d672cd7f55
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578547818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578547818 +0000

[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: df94694c42 am: 088c30b5ca -s ours
am skip reason: Change-Id Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9 with SHA-1 e8aa5acef5 is in history

Change-Id: Ia81254428c87431c0ec7f6fde4cc44d2e7e2a195