[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: 250cdf66 -s ours am: fe321a93 -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: I80752c5ee9b10e9134a146c4c3256eeb40b9a038