tree 8498c791915ae4c672b3f71f5df54c67de77dc37
parent 491d271c028a04e0da906862f7d5a4ff4e1b83de
parent c1e3f54709159528b7c7f4c15506b12338639625
author Hall Liu <hallliu@google.com> 1603403357 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603403357 +0000

Merge changes from topic "telephonymanager-data-policy" am: 11d63a2dfb am: c1e3f54709

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1469912

Change-Id: Ie1742310eb961ca84358c655133b3b50e39f8177