Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329 am: 1e499641ce" into oc-mr1-dev-plus-aosp
am: 7233f04d61

Change-Id: If76c9900cc44e171bbe4b9b871c9601f313a4cc8