[automerger skipped] Merge "Clarify&rename wfc_entitlement_required_countries config" am: 400ba6c2aa am: 030dcc3544 -s ours

am skip reason: Merged-In I51e0319cd60308618364be7462070430387a143c with SHA-1 c9fd0b2993 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/14804215

Change-Id: I6fc6a98c36dd775dbeda99acd98cc9c2c933ee49