Merge "Adjust the alert message when the user cannot make a phone call. am: 25310ec966 am: 45d6860c91 am: ab4811d462" into oc-dev-plus-aosp
am: 051b27d71a

Change-Id: I553ec885c3151e73893a2ef4bfa035a5abeb1992