[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 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: I98cf03b5cb9ae28cee4d6d73c4e57a0bc56f6b7f