Merge "Change summary text of Wi-Fi calling" am: 68fdc5b7be
am: 281b94320e

Change-Id: Idd9ea6149ec9ddd3d122bcb6d4f9192a774f113d