tree 76e69317ca86aae220c6f803ce8ff0d95101e8ab
parent ec7dcd02f6598dc38e1373c9bcd0320b28fd4575
author Jeff Sharkey <jsharkey@android.com> 1417643066 -0800
committer The Android Automerger <android-build@google.com> 1418153888 -0800

Offer to "merge" subscribers for data usage.

When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.

Also remove some code related to long-dormant split policies.

Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391