[automerger skipped] Merge "Check WFC enabled in getCombinedRegState" am:...

[automerger skipped] Merge "Check WFC enabled in getCombinedRegState" am: c0f1b6b5 -s ours am: b37276e5 -s ours am: 3a9089a2 -s ours am: 03b9a1e2 -s ours am: bc4d7c12 -s ours

am skip reason: Change-Id Ifded01d890193c2b18a36a5c87849dbdefe7d970 with SHA-1 491a5ab2 is in history

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

Change-Id: I17b86a6a108e8af12c1845cb743b3753b868bab3