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

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

Change-Id: I9dbaf6756d5efec703113c2ac6383f126d7e9752