Merge "Consider roaming state before promoting WFC" am: a5b4bddce6 am: 4fd554113c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1494659

Change-Id: I235d5c14394de2488067a8bca63e03f76dfcddae