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