[automerger skipped] Merge "Add enterprise to metered APN" am: 852b5df9 am:...

[automerger skipped] Merge "Add enterprise to metered APN" am: 852b5df9 am: a7aa3d68 am: 34775786 am: b1c0df33 am: d224092d -s ours am: 8ea3d03d -s ours

am skip reason: Merged-In I4d71f5f260d131fe6f6341c13c2e3e7628b3f740 with SHA-1 c7b1211b is already in history

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



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