[automerger skipped] Merge "Always allow unmetered APNs when romaing" am:...

[automerger skipped] Merge "Always allow unmetered APNs when romaing" am: 6546a6f9 am: fb4e23d9 -s ours am: e3c5b5b4 -s ours

am skip reason: Change-Id I8d623c138a594bf0ff8f6a07fcabffa6f408e805 with SHA-1 f8462eb1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1340454

Change-Id: I76864630bf502f41de3ec19fa81cfc0a73333a81