Merge "Add enterprise to metered APN" into udc-qpr-dev am: eb1d54b2 am: adf7b8c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23752441



Change-Id: I7c962aa48ccde0a652fecd132dc476bbe8a2c74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>