Merge "Detached unmetered APN logic from old data stack" into tm-dev am: 79e730ee26

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

Change-Id: I6e971a50cc70d94b94804b36192c0f9652820648