Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 22e73205df am: d45a9f335a" into oc-mr1-dev-plus-aosp