[automerger skipped] Merge "WFC SPN only when connected to WiFi" am:...

[automerger skipped] Merge "WFC SPN only when connected to WiFi" am: 01df6a78 am: 6df51fdb am: cf03a4ca am: 3b584842 -s ours

am skip reason: Merged-In Ib77c83a7ba759cf1c1bcc0054f97e9a02b3c74fc with SHA-1 9beac3c0 is already in history

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

Change-Id: I20222949f176b3af36ab034c17555a7f969cc370