Update ViLTE strings to reflect "carrier" video calling

Outgoing video call: https://drive.google.com/open?id=0B7uuA4cyYX0xQjhUTGhrUWRKUlE
Incoming video call: https://drive.google.com/open?id=0B7uuA4cyYX0xZFMyREVDWVNqaE0
Outgoing upgrade: https://drive.google.com/open?id=0B7uuA4cyYX0xdll3elRsUWhDT3M
Incoming upgrade: https://drive.google.com/open?id=0B7uuA4cyYX0xZFMyREVDWVNqaE0
Incoming upgrade (Wi-Fi): https://drive.google.com/open?id=0B7uuA4cyYX0xWkJ6dU16Rmd1ckk

Bug: 65131278
Test: manual, screenshots
PiperOrigin-RevId: 169612967
Change-Id: I5163be6966ed7d68d19cff51e0d1637bd20b2c7e
diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java
index fa8b985..12a1184 100644
--- a/java/com/android/incallui/contactgrid/TopRow.java
+++ b/java/com/android/incallui/contactgrid/TopRow.java
@@ -143,9 +143,9 @@
       Context context, @SessionModificationState int sessionModificationState, boolean isWifi) {
     if (sessionModificationState == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
       if (isWifi) {
-        return context.getString(R.string.contact_grid_incoming_wifi_video_request);
+        return context.getString(R.string.contact_grid_incoming_wifi_video_call);
       } else {
-        return context.getString(R.string.contact_grid_incoming_video_request);
+        return context.getString(R.string.contact_grid_incoming_video_call);
       }
     } else {
       if (isWifi) {
@@ -185,7 +185,7 @@
   private static CharSequence getLabelForVideoRequest(Context context, PrimaryCallState state) {
     switch (state.sessionModificationState) {
       case SessionModificationState.WAITING_FOR_UPGRADE_TO_VIDEO_RESPONSE:
-        return context.getString(R.string.incall_video_call_requesting);
+        return context.getString(R.string.incall_video_call_upgrade_request);
       case SessionModificationState.REQUEST_FAILED:
       case SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_FAILED:
         return context.getString(R.string.incall_video_call_request_failed);