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

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

Change-Id: Ie7cc0d5eba9a6fc0d029d850c8b202c3ebf347da