Update AOSP Dialer source from internal google3 repository at

cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217

230 files changed, 2452 insertions, 660 deletions

diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 4ddaa6ab5..276b47a5e 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -37,10 +37,6 @@
   <!-- Testing location -->
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
-  <!-- This is used for querying Cequint caller id.
-       TODO(b/36600947): Move to oem package. -->
-  <uses-permission android:name="com.cequint.ecid.CALLER_ID_LOOKUP" />
-
   <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper
   navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a
   call.
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java
index 77b472b39..f48413d92 100644
--- a/java/com/android/incallui/AnswerScreenPresenter.java
+++ b/java/com/android/incallui/AnswerScreenPresenter.java
@@ -101,10 +101,10 @@ public class AnswerScreenPresenter
 
   @Override
   public void onAnswerAndReleaseCall() {
-    Log.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "enterBlock");
+    LogUtil.enterBlock("AnswerScreenPresenter.onAnswerAndReleaseCall");
     DialerCall activeCall = CallList.getInstance().getActiveCall();
     if (activeCall == null) {
-      Log.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "activeCall == null");
+      LogUtil.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "activeCall == null");
       onAnswer(false);
     } else {
       activeCall.addListener(new AnswerOnDisconnected(activeCall));
@@ -137,7 +137,8 @@ public class AnswerScreenPresenter
 
     @Override
     public void onDialerCallDisconnect() {
-      Log.i("AnswerScreenPresenter.AnswerOnDisconnected", "Call disconnected, answering new call");
+      LogUtil.i(
+          "AnswerScreenPresenter.AnswerOnDisconnected", "call disconnected, answering new call");
       call.answer();
       disconnectingCall.removeListener(this);
     }
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index 69e25ff97..d2bd31998 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -427,7 +427,7 @@ public class CallButtonPresenter
   }
 
   private boolean hasVideoCallCapabilities(DialerCall call) {
-    return call.getVideoTech().isAvailable();
+    return call.getVideoTech().isAvailable(mContext);
   }
 
   /**
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index 8cd9a07c4..6a34688e8 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -50,6 +50,8 @@ import com.android.dialer.compat.ActivityCompat;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.nano.DialerImpression;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
@@ -182,8 +184,6 @@ public class CallCardPresenter
       mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
     }
 
-    EnrichedCallComponent.get(mContext).getEnrichedCallManager().registerStateChangedListener(this);
-
     // Contact search may have completed before ui is ready.
     if (mPrimaryContactInfo != null) {
       updatePrimaryDisplayInfo();
@@ -196,9 +196,26 @@ public class CallCardPresenter
     InCallPresenter.getInstance().addInCallEventListener(this);
     isInCallScreenReady = true;
 
+    // Log location impressions
+    if (isOutgoingEmergencyCall(mPrimary)) {
+      Logger.get(mContext).logImpression(DialerImpression.Type.EMERGENCY_NEW_EMERGENCY_CALL);
+    } else if (isIncomingEmergencyCall(mPrimary) || isIncomingEmergencyCall(mSecondary)) {
+      Logger.get(mContext).logImpression(DialerImpression.Type.EMERGENCY_CALLBACK);
+    }
+
     // Showing the location may have been skipped if the UI wasn't ready during previous layout.
     if (shouldShowLocation()) {
       updatePrimaryDisplayInfo();
+
+      // Log location impressions
+      if (!hasLocationPermission()) {
+        Logger.get(mContext).logImpression(DialerImpression.Type.EMERGENCY_NO_LOCATION_PERMISSION);
+      } else if (isBatteryTooLowForEmergencyLocation()) {
+        Logger.get(mContext)
+            .logImpression(DialerImpression.Type.EMERGENCY_BATTERY_TOO_LOW_TO_GET_LOCATION);
+      } else if (!callLocation.canGetLocation(mContext)) {
+        Logger.get(mContext).logImpression(DialerImpression.Type.EMERGENCY_CANT_GET_LOCATION);
+      }
     }
   }
 
@@ -207,9 +224,6 @@ public class CallCardPresenter
     LogUtil.i("CallCardController.onInCallScreenUnready", null);
     Assert.checkState(isInCallScreenReady);
 
-    EnrichedCallComponent.get(mContext)
-        .getEnrichedCallManager()
-        .unregisterStateChangedListener(this);
     // stop getting call state changes
     InCallPresenter.getInstance().removeListener(this);
     InCallPresenter.getInstance().removeIncomingCallListener(this);
@@ -714,7 +728,9 @@ public class CallCardPresenter
               number,
               name,
               nameIsNumber,
-              mPrimaryContactInfo.location,
+              shouldShowLocationAsLabel(nameIsNumber, mPrimaryContactInfo.shouldShowLocation)
+                  ? mPrimaryContactInfo.location
+                  : null,
               isChildNumberShown || isCallSubjectShown ? null : mPrimaryContactInfo.label,
               mPrimaryContactInfo.photo,
               mPrimaryContactInfo.photoType,
@@ -739,6 +755,17 @@ public class CallCardPresenter
     }
   }
 
+  private static boolean shouldShowLocationAsLabel(
+      boolean nameIsNumber, boolean shouldShowLocation) {
+    if (nameIsNumber) {
+      return true;
+    }
+    if (shouldShowLocation) {
+      return true;
+    }
+    return false;
+  }
+
   private Fragment getLocationFragment() {
     if (!ConfigProviderBindings.get(mContext)
         .getBoolean(CONFIG_ENABLE_EMERGENCY_LOCATION, CONFIG_ENABLE_EMERGENCY_LOCATION_DEFAULT)) {
@@ -1031,11 +1058,21 @@ public class CallCardPresenter
 
   @Override
   public void onInCallScreenResumed() {
+    EnrichedCallComponent.get(mContext).getEnrichedCallManager().registerStateChangedListener(this);
+    updatePrimaryDisplayInfo();
+
     if (shouldSendAccessibilityEvent) {
       handler.postDelayed(sendAccessibilityEventRunnable, ACCESSIBILITY_ANNOUNCEMENT_DELAY_MILLIS);
     }
   }
 
+  @Override
+  public void onInCallScreenPaused() {
+    EnrichedCallComponent.get(mContext)
+        .getEnrichedCallManager()
+        .unregisterStateChangedListener(this);
+  }
+
   static boolean sendAccessibilityEvent(Context context, InCallScreen inCallScreen) {
     AccessibilityManager am =
         (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
diff --git a/java/com/android/incallui/CallerInfo.java b/java/com/android/incallui/CallerInfo.java
index 473bb8f4e..f0dbe9179 100644
--- a/java/com/android/incallui/CallerInfo.java
+++ b/java/com/android/incallui/CallerInfo.java
@@ -105,6 +105,7 @@ public class CallerInfo {
   public String normalizedNumber;
   public String forwardingNumber;
   public String geoDescription;
+  boolean shouldShowGeoDescription;
   public String cnapName;
   public int numberPresentation;
   public int namePresentation;
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index 4c8963a98..9e696b55e 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -22,7 +22,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.SystemClock;
@@ -33,6 +32,7 @@ import android.provider.ContactsContract.DisplayNameSources;
 import android.support.annotation.AnyThread;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.TelecomManager;
@@ -42,6 +42,9 @@ import android.util.ArrayMap;
 import android.util.ArraySet;
 import com.android.contacts.common.ContactsUtils;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import com.android.dialer.logging.nano.ContactLookupResult;
 import com.android.dialer.oem.CequintCallerIdManager;
 import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact;
@@ -83,6 +86,44 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
   private Drawable mDefaultContactPhotoDrawable;
   private Drawable mConferencePhotoDrawable;
   private int mQueryId;
+  private final DialerExecutor<CnapInformationWrapper> cachedNumberLookupExecutor =
+      DialerExecutors.createNonUiTaskBuilder(new CachedNumberLookupWorker()).build();
+
+  private static class CachedNumberLookupWorker implements Worker<CnapInformationWrapper, Void> {
+    @Nullable
+    @Override
+    public Void doInBackground(@Nullable CnapInformationWrapper input) {
+      if (input == null) {
+        return null;
+      }
+      ContactInfo contactInfo = new ContactInfo();
+      CachedContactInfo cacheInfo = input.service.buildCachedContactInfo(contactInfo);
+      cacheInfo.setSource(CachedContactInfo.SOURCE_TYPE_CNAP, "CNAP", 0);
+      contactInfo.name = input.cnapName;
+      contactInfo.number = input.number;
+      contactInfo.type = ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
+      try {
+        final JSONObject contactRows =
+            new JSONObject()
+                .put(
+                    Phone.CONTENT_ITEM_TYPE,
+                    new JSONObject()
+                        .put(Phone.NUMBER, contactInfo.number)
+                        .put(Phone.TYPE, Phone.TYPE_MAIN));
+        final String jsonString =
+            new JSONObject()
+                .put(Contacts.DISPLAY_NAME, contactInfo.name)
+                .put(Contacts.DISPLAY_NAME_SOURCE, DisplayNameSources.STRUCTURED_NAME)
+                .put(Contacts.CONTENT_ITEM_TYPE, contactRows)
+                .toString();
+        cacheInfo.setLookupKey(jsonString);
+      } catch (JSONException e) {
+        Log.w(TAG, "Creation of lookup key failed when caching CNAP information");
+      }
+      input.service.addContact(input.context.getApplicationContext(), cacheInfo);
+      return null;
+    }
+  }
 
   private ContactInfoCache(Context context) {
     mContext = context;
@@ -117,7 +158,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     Objects.requireNonNull(info);
     String displayName = null;
     String displayNumber = null;
-    String displayLocation = null;
     String label = null;
     boolean isSipCall = false;
 
@@ -188,23 +228,11 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         // dialpad.
         displayNumber = PhoneNumberHelper.formatNumber(number, context);
 
-        // Display a geographical description string if available
-        // (but only for incoming calls.)
-        if (isIncoming) {
-          // TODO (CallerInfoAsyncQuery cleanup): Fix the CallerInfo
-          // query to only do the geoDescription lookup in the first
-          // place for incoming calls.
-          displayLocation = info.geoDescription; // may be null
-          Log.d(TAG, "Geodescrption: " + info.geoDescription);
-        }
-
         Log.d(
             TAG,
             "  ==>  no name; falling back to number:"
                 + " displayNumber '"
                 + Log.pii(displayNumber)
-                + "', displayLocation '"
-                + displayLocation
                 + "'");
       }
     } else {
@@ -237,11 +265,12 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
 
     cce.namePrimary = displayName;
     cce.number = displayNumber;
-    cce.location = displayLocation;
+    cce.location = info.geoDescription;
     cce.label = label;
     cce.isSipCall = isSipCall;
     cce.userType = info.userType;
     cce.originalPhoneNumber = info.phoneNumber;
+    cce.shouldShowLocation = info.shouldShowGeoDescription;
 
     if (info.contactExists) {
       cce.contactLookupResult = ContactLookupResult.Type.LOCAL_CONTACT;
@@ -271,6 +300,21 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     return mInfoMap.get(callId);
   }
 
+  private static final class CnapInformationWrapper {
+    final String number;
+    final String cnapName;
+    final Context context;
+    final CachedNumberLookupService service;
+
+    CnapInformationWrapper(
+        String number, String cnapName, Context context, CachedNumberLookupService service) {
+      this.number = number;
+      this.cnapName = cnapName;
+      this.context = context;
+      this.service = service;
+    }
+  }
+
   void maybeInsertCnapInformationIntoCache(
       Context context, final DialerCall call, final CallerInfo info) {
     final CachedNumberLookupService cachedNumberLookupService =
@@ -284,39 +328,11 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         || mInfoMap.get(call.getId()) != null) {
       return;
     }
-    final Context applicationContext = context.getApplicationContext();
     Log.i(TAG, "Found contact with CNAP name - inserting into cache");
-    new AsyncTask<Void, Void, Void>() {
-      @Override
-      protected Void doInBackground(Void... params) {
-        ContactInfo contactInfo = new ContactInfo();
-        CachedContactInfo cacheInfo = cachedNumberLookupService.buildCachedContactInfo(contactInfo);
-        cacheInfo.setSource(CachedContactInfo.SOURCE_TYPE_CNAP, "CNAP", 0);
-        contactInfo.name = info.cnapName;
-        contactInfo.number = call.getNumber();
-        contactInfo.type = ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
-        try {
-          final JSONObject contactRows =
-              new JSONObject()
-                  .put(
-                      Phone.CONTENT_ITEM_TYPE,
-                      new JSONObject()
-                          .put(Phone.NUMBER, contactInfo.number)
-                          .put(Phone.TYPE, Phone.TYPE_MAIN));
-          final String jsonString =
-              new JSONObject()
-                  .put(Contacts.DISPLAY_NAME, contactInfo.name)
-                  .put(Contacts.DISPLAY_NAME_SOURCE, DisplayNameSources.STRUCTURED_NAME)
-                  .put(Contacts.CONTENT_ITEM_TYPE, contactRows)
-                  .toString();
-          cacheInfo.setLookupKey(jsonString);
-        } catch (JSONException e) {
-          Log.w(TAG, "Creation of lookup key failed when caching CNAP information");
-        }
-        cachedNumberLookupService.addContact(applicationContext, cacheInfo);
-        return null;
-      }
-    }.execute();
+
+    cachedNumberLookupExecutor.executeParallel(
+        new CnapInformationWrapper(
+            call.getNumber(), info.cnapName, context, cachedNumberLookupService));
   }
 
   /**
@@ -383,7 +399,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         CallerInfoUtils.getCallerInfoForCall(
             mContext,
             call,
-            new DialerCallCookieWrapper(callId, call.getNumberPresentation()),
+            new DialerCallCookieWrapper(callId, call.getNumberPresentation(), call.getCnapName()),
             new FindInfoCallback(isIncoming, queryToken));
 
     if (cacheEntry != null) {
@@ -478,22 +494,34 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     return cacheEntry;
   }
 
-  private void maybeUpdateFromCequintCallerId(CallerInfo callerInfo, boolean isIncoming) {
+  private void maybeUpdateFromCequintCallerId(
+      CallerInfo callerInfo, String cnapName, boolean isIncoming) {
     if (!CequintCallerIdManager.isCequintCallerIdEnabled(mContext)) {
       return;
     }
+    if (callerInfo.phoneNumber == null) {
+      return;
+    }
     CequintCallerIdContact cequintCallerIdContact =
         CequintCallerIdManager.getCequintCallerIdContactForInCall(
-            mContext, callerInfo.phoneNumber, callerInfo.cnapName, isIncoming);
+            mContext, callerInfo.phoneNumber, cnapName, isIncoming);
+
+    if (cequintCallerIdContact == null) {
+      return;
+    }
 
-    if (!TextUtils.isEmpty(cequintCallerIdContact.name)) {
+    if (TextUtils.isEmpty(callerInfo.name) && !TextUtils.isEmpty(cequintCallerIdContact.name)) {
       callerInfo.name = cequintCallerIdContact.name;
+      callerInfo.contactExists = true;
     }
     if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
       callerInfo.geoDescription = cequintCallerIdContact.geoDescription;
+      callerInfo.shouldShowGeoDescription = true;
+      callerInfo.contactExists = true;
     }
-    if (cequintCallerIdContact.imageUrl != null) {
+    if (callerInfo.contactDisplayPhotoUri == null && cequintCallerIdContact.imageUrl != null) {
       callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.imageUrl);
+      callerInfo.contactExists = true;
     }
   }
 
@@ -691,6 +719,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     int queryId;
     /** The phone number without any changes to display to the user (ex: cnap...) */
     String originalPhoneNumber;
+    boolean shouldShowLocation;
 
     boolean isBusiness;
 
@@ -730,17 +759,21 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
           + queryId
           + ", originalPhoneNumber="
           + originalPhoneNumber
+          + ", shouldShowLocation="
+          + shouldShowLocation
           + '}';
     }
   }
 
   private static final class DialerCallCookieWrapper {
-    public final String callId;
-    public final int numberPresentation;
+    final String callId;
+    final int numberPresentation;
+    final String cnapName;
 
-    public DialerCallCookieWrapper(String callId, int numberPresentation) {
+    DialerCallCookieWrapper(String callId, int numberPresentation, String cnapName) {
       this.callId = callId;
       this.numberPresentation = numberPresentation;
+      this.cnapName = cnapName;
     }
   }
 
@@ -749,7 +782,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     private final boolean mIsIncoming;
     private final CallerInfoQueryToken mQueryToken;
 
-    public FindInfoCallback(boolean isIncoming, CallerInfoQueryToken queryToken) {
+    FindInfoCallback(boolean isIncoming, CallerInfoQueryToken queryToken) {
       mIsIncoming = isIncoming;
       mQueryToken = queryToken;
     }
@@ -762,7 +795,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         return;
       }
       long start = SystemClock.uptimeMillis();
-      maybeUpdateFromCequintCallerId(ci, mIsIncoming);
+      maybeUpdateFromCequintCallerId(ci, cw.cnapName, mIsIncoming);
       long time = SystemClock.uptimeMillis() - start;
       Log.d(TAG, "Cequint Caller Id look up takes " + time + " ms.");
       updateCallerInfoInCacheOnAnyThread(
@@ -844,6 +877,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         // field is no longer used; it is persisted here in case
         // the UI is ever changed to use it.
         entry.location = oldEntry.location;
+        entry.shouldShowLocation = oldEntry.shouldShowLocation;
         // Contact specific ringtone is obtained from local lookup.
         entry.contactRingtoneUri = oldEntry.contactRingtoneUri;
       }
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index db4d88486..d3d839909 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -40,6 +40,7 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.nano.InteractionEvent;
 import com.android.dialer.postcall.PostCall;
@@ -320,6 +321,9 @@ public class InCallPresenter implements CallList.Listener {
     mStatusBarNotifier = statusBarNotifier;
     mExternalCallNotifier = externalCallNotifier;
     addListener(mStatusBarNotifier);
+    EnrichedCallComponent.get(mContext)
+        .getEnrichedCallManager()
+        .registerStateChangedListener(mStatusBarNotifier);
 
     mProximitySensor = proximitySensor;
     addListener(mProximitySensor);
@@ -1003,7 +1007,10 @@ public class InCallPresenter implements CallList.Listener {
   void onActivityStarted() {
     Log.d(this, "onActivityStarted");
     notifyVideoPauseController(true);
-    mStatusBarNotifier.updateNotification(mCallList);
+    if (mStatusBarNotifier != null) {
+      // TODO - b/36649622: Investigate this redundant call
+      mStatusBarNotifier.updateNotification(mCallList);
+    }
   }
 
   /*package*/
@@ -1297,12 +1304,7 @@ public class InCallPresenter implements CallList.Listener {
     } else if (startIncomingCallSequence) {
       Log.i(this, "Start Full Screen in call UI");
 
-      if (!startUi()) {
-        // startUI refused to start the UI. This indicates that it needed to restart the
-        // activity.  When it finally restarts, it will call us back, so we do not actually
-        // change the state yet (we return mInCallState instead of newState).
-        return mInCallState;
-      }
+      mStatusBarNotifier.updateNotification(mCallList);
     } else if (newState == InCallState.NO_CALLS) {
       // The new state is the no calls state.  Tear everything down.
       attemptFinishActivity();
@@ -1339,18 +1341,6 @@ public class InCallPresenter implements CallList.Listener {
     }
   }
 
-  private boolean startUi() {
-    boolean isCallWaiting =
-        mCallList.getActiveCall() != null && mCallList.getIncomingCall() != null;
-
-    if (isCallWaiting) {
-      showInCall(false, false);
-    } else {
-      mStatusBarNotifier.updateNotification(mCallList);
-    }
-    return true;
-  }
-
   /**
    * @return {@code true} if the InCallPresenter is ready to be torn down, {@code false} otherwise.
    *     Calling classes should use this as an indication whether to interact with the
@@ -1387,7 +1377,11 @@ public class InCallPresenter implements CallList.Listener {
 
       if (mStatusBarNotifier != null) {
         removeListener(mStatusBarNotifier);
+        EnrichedCallComponent.get(mContext)
+            .getEnrichedCallManager()
+            .unregisterStateChangedListener(mStatusBarNotifier);
       }
+
       if (mExternalCallNotifier != null && mExternalCallList != null) {
         mExternalCallList.removeExternalCallListener(mExternalCallNotifier);
       }
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 6453d5b62..405eede34 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -66,6 +66,10 @@ import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.BitmapUtil;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.notification.NotificationChannelManager;
 import com.android.dialer.notification.NotificationChannelManager.Channel;
 import com.android.dialer.oem.MotorolaUtils;
@@ -86,7 +90,8 @@ import java.util.Locale;
 import java.util.Objects;
 
 /** This class adds Notifications to the status bar for the in-call experience. */
-public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
+public class StatusBarNotifier
+    implements InCallPresenter.InCallStateListener, EnrichedCallManager.StateChangedListener {
 
   // Notification types
   // Indicates that no notification is currently showing.
@@ -116,7 +121,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
   private StatusBarCallListener mStatusBarCallListener;
   private boolean mShowFullScreenIntent;
 
-  StatusBarNotifier(@NonNull Context context, @NonNull ContactInfoCache contactInfoCache) {
+  public StatusBarNotifier(@NonNull Context context, @NonNull ContactInfoCache contactInfoCache) {
     Objects.requireNonNull(context);
     mContext = context;
     mContactsPreferences = ContactsPreferencesFactory.newContactsPreferences(mContext);
@@ -181,6 +186,12 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
     updateNotification(callList);
   }
 
+  @Override
+  public void onEnrichedCallStateChanged() {
+    LogUtil.enterBlock("StatusBarNotifier.onEnrichedCallStateChanged");
+    updateNotification(CallList.getInstance());
+  }
+
   /**
    * Updates the phone app's status bar notification *and* launches the incoming call UI in response
    * to a new incoming call.
@@ -199,7 +210,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
    * @see #updateInCallNotification(CallList)
    */
   @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
-  void updateNotification(CallList callList) {
+  public void updateNotification(CallList callList) {
     updateInCallNotification(callList);
   }
 
@@ -637,7 +648,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
       return R.drawable.ic_phone_paused_white_24dp;
     } else if (call.getVideoTech().getSessionModificationState()
         == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
-      return R.drawable.ic_videocam;
+      return R.drawable.quantum_ic_videocam_white_24;
     } else if (call.hasProperty(PROPERTY_HIGH_DEF_AUDIO)
         && MotorolaUtils.shouldShowHdIconInNotification(mContext)) {
       // Normally when a call is ongoing the status bar displays an icon of a phone with animated
@@ -671,14 +682,20 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
     }
 
     if (isIncomingOrWaiting) {
-      if (call.hasProperty(Details.PROPERTY_WIFI)) {
+      EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
+      Session session = null;
+      if (call.getNumber() != null) {
+        session = manager.getSession(call.getUniqueCallId(), call.getNumber());
+      }
+
+      if (call.isSpam()) {
+        resId = R.string.notification_incoming_spam_call;
+      } else if (session != null) {
+        resId = getECIncomingCallText(session);
+      } else if (call.hasProperty(Details.PROPERTY_WIFI)) {
         resId = R.string.notification_incoming_call_wifi;
       } else {
-        if (call.isSpam()) {
-          resId = R.string.notification_incoming_spam_call;
-        } else {
-          resId = R.string.notification_incoming_call;
-        }
+        resId = R.string.notification_incoming_call;
       }
     } else if (call.getState() == DialerCall.State.ONHOLD) {
       resId = R.string.notification_on_hold;
@@ -698,6 +715,66 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
     return mContext.getString(resId);
   }
 
+  private int getECIncomingCallText(Session session) {
+    int resId;
+    MultimediaData data = session.getMultimediaData();
+    boolean hasImage = data.hasImageData();
+    boolean hasSubject = !TextUtils.isEmpty(data.getText());
+    boolean hasMap = data.getLocation() != null;
+    if (data.isImportant()) {
+      if (hasMap) {
+        if (hasImage) {
+          if (hasSubject) {
+            resId = R.string.important_notification_incoming_call_with_photo_message_location;
+          } else {
+            resId = R.string.important_notification_incoming_call_with_photo_location;
+          }
+        } else if (hasSubject) {
+          resId = R.string.important_notification_incoming_call_with_message_location;
+        } else {
+          resId = R.string.important_notification_incoming_call_with_location;
+        }
+      } else if (hasImage) {
+        if (hasSubject) {
+          resId = R.string.important_notification_incoming_call_with_photo_message;
+        } else {
+          resId = R.string.important_notification_incoming_call_with_photo;
+        }
+      } else {
+        resId = R.string.important_notification_incoming_call_with_message;
+      }
+      if (mContext.getString(resId).length() > 50) {
+        resId = R.string.important_notification_incoming_call_attachments;
+      }
+    } else {
+      if (hasMap) {
+        if (hasImage) {
+          if (hasSubject) {
+            resId = R.string.notification_incoming_call_with_photo_message_location;
+          } else {
+            resId = R.string.notification_incoming_call_with_photo_location;
+          }
+        } else if (hasSubject) {
+          resId = R.string.notification_incoming_call_with_message_location;
+        } else {
+          resId = R.string.notification_incoming_call_with_location;
+        }
+      } else if (hasImage) {
+        if (hasSubject) {
+          resId = R.string.notification_incoming_call_with_photo_message;
+        } else {
+          resId = R.string.notification_incoming_call_with_photo;
+        }
+      } else {
+        resId = R.string.notification_incoming_call_with_message;
+      }
+    }
+    if (mContext.getString(resId).length() > 50) {
+      resId = R.string.notification_incoming_call_attachments;
+    }
+    return resId;
+  }
+
   /** Gets the most relevant call to display in the notification. */
   private DialerCall getCallToShow(CallList callList) {
     if (callList == null) {
@@ -755,7 +832,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         createNotificationPendingIntent(mContext, ACTION_DECLINE_INCOMING_CALL);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.drawable.ic_close_dk),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_close_white_24),
                 getActionText(
                     R.string.notification_action_dismiss, R.color.notification_action_dismiss),
                 declinePendingIntent)
@@ -785,7 +862,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         createNotificationPendingIntent(mContext, ACTION_ANSWER_VIDEO_INCOMING_CALL);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.drawable.ic_videocam),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_videocam_white_24),
                 getActionText(
                     R.string.notification_action_answer_video,
                     R.color.notification_action_answer_video),
@@ -801,7 +878,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         createNotificationPendingIntent(mContext, ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.drawable.ic_videocam),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_videocam_white_24),
                 getActionText(
                     R.string.notification_action_accept, R.color.notification_action_accept),
                 acceptVideoPendingIntent)
@@ -816,7 +893,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         createNotificationPendingIntent(mContext, ACTION_DECLINE_VIDEO_UPGRADE_REQUEST);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.drawable.ic_videocam),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_videocam_white_24),
                 getActionText(
                     R.string.notification_action_dismiss, R.color.notification_action_dismiss),
                 declineVideoPendingIntent)
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 5d2138ee0..31999ef2e 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -154,8 +154,8 @@ public class VideoCallPresenter
 
   /**
    * Determines if the incoming video surface should be shown based on the current videoState and
-   * callState. The video surface is shown when incoming video is not paused, the call is active,
-   * and video reception is enabled.
+   * callState. The video surface is shown when incoming video is not paused, the call is active or
+   * dialing and video reception is enabled.
    *
    * @param videoState The current video state.
    * @param callState The current call state.
@@ -168,8 +168,13 @@ public class VideoCallPresenter
 
     boolean isPaused = VideoProfile.isPaused(videoState);
     boolean isCallActive = callState == DialerCall.State.ACTIVE;
+    //Show incoming Video for dialing calls to support early media
+    boolean isCallOutgoingPending =
+        DialerCall.State.isDialing(callState) || callState == DialerCall.State.CONNECTING;
 
-    return !isPaused && isCallActive && VideoProfile.isReceptionEnabled(videoState);
+    return !isPaused
+        && (isCallActive || isCallOutgoingPending)
+        && VideoProfile.isReceptionEnabled(videoState);
   }
 
   /**
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 553856711..9eb29ace0 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -854,6 +854,12 @@ public class AnswerFragment extends Fragment
   }
 
   private void animateEntry(@NonNull View rootView) {
+    if (!isAdded()) {
+      LogUtil.i(
+          "AnswerFragment.animateEntry",
+          "Not currently added to Activity. Will not start entry animation.");
+      return;
+    }
     contactGridManager.getContainerView().setAlpha(0f);
     Animator alpha =
         ObjectAnimator.ofFloat(contactGridManager.getContainerView(), View.ALPHA, 0, 1);
@@ -869,7 +875,8 @@ public class AnswerFragment extends Fragment
     if (isShowingLocationUi()) {
       builder.with(createTranslation(rootView.findViewById(R.id.incall_location_holder)));
     }
-    animatorSet.setDuration(getResources().getInteger(R.integer.answer_animate_entry_millis));
+    animatorSet.setDuration(
+        rootView.getResources().getInteger(R.integer.answer_animate_entry_millis));
     animatorSet.addListener(
         new AnimatorListenerAdapter() {
           @Override
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
index 1de03a55c..acae6eb26 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"PAW-Modus aktiviert"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"PAW-Modus deaktiviert"</string>
+    <string name="event_activated" msgid="4737012691463830969">"Tierpfoten-Modus aktiviert"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Tierpfoten-Modus deaktiviert"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
index ebd8e2f0e..478da3e59 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"Modo PAW habilitado"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"Modo PAW inhabilitado"</string>
+    <string name="event_activated" msgid="4737012691463830969">"Modo pata habilitado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo pata inhabilitado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
index abbeaf15f..845326cfc 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"Omogućen PAW način rada"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"Onemoguće način rada PAW"</string>
+    <string name="event_activated" msgid="4737012691463830969">"Omogućen način rada PAW"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Onemogućen način rada PAW"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
index d0ef36f84..a1f2d59fa 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"Modul Paw a fost activat"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"Modul Paw a fost dezactivat."</string>
+    <string name="event_activated" msgid="4737012691463830969">"Modul „lăbuță” a fost activat"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modul „lăbuță” a fost dezactivat."</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
index 913a362ec..bb002f382 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"Режим PAW включен"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"Режим PAW отключен"</string>
+    <string name="event_activated" msgid="4737012691463830969">"Режим лапы включен"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Режим лапы отключен"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
index eb78565a5..6be36feef 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_activated" msgid="4737012691463830969">"PAW режим је омогућен"</string>
-    <string name="event_deactivated" msgid="4504516573331084650">"PAW режим је онемогућен"</string>
+    <string name="event_activated" msgid="4737012691463830969">"Омогућен је режим шапе"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Онемогућен је режим шапе"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
index 2c08f5fe1..5ca0a1e5b 100644
--- a/java/com/android/incallui/answer/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swiep vanaf ikoon om as \'n oudio-oproep te antwoord"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swiep op om te antwoord en die voortgesette oproep aan te hou"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swiep op om te antwoord en die aangehoude oproep te beëindig"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Swiep van die ikoon af om die inkomende oproep te antwoord en die voortgesette oproep te beëindig"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swiep van die ikoon af om te antwoord en die voortgesette oproep te beëindig"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skryf jou eie …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Selfoon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Luidsprekerfoon"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Stuur"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Weier hierdie oproep met ’n boodskap"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Antwoord as oudio-oproep"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Antwoord die inkomende oproep en beëindig die voortgesette oproep"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Antwoord en beëindig die voortgesette oproep"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Weier met boodskap"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Antwoord as oudio-oproep"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Antwoord die inkomende oproep en beëindig die voortgesette oproep"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Antwoord en beëindig die voortgesette oproep"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is af"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swiep op met twee vingers om te antwoord. Swiep af met twee vingers om af te wys."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Belangrike oproep"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
index 008273e21..31abea4de 100644
--- a/java/com/android/incallui/answer/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"እንደ ኦዲዮ ጥሪ ለመመለስ ከአዶ ያንሸራቱ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"በመካሄድ ላይ ያለ ጥሪ ለመመለስ እና ለመያዝ ወደ ላይ ያንሸራትቱ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"በይቆይ ላይ ያለ ጥሪ ለመመለስ እና ለመጨረስ ወደ ላይ ያንሸራትቱ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ገቢ ጥሪን ለመመለስና እየተካሄዳ ያለ ጥሪ ለመጨረስ ከአዶ ያንሸራቱ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ለመመለስ እና በመካሄድ ላይ ያለ ጥሪን ለመጨረስ ከአዶ ያንሸራትቱ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"የእራስዎን ይጻፉ…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"የስልክ እጀታ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ባለድምጽማጉያ ስልክ"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ላክ"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"መልዕክት በመላክ ይህን ጥሪ አይቀበሉ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"እንደ ኦዲዮ ጥሪ ይመልሱ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ገቢ ጥሪን ይመልሱ እንዲሁም በመካሄድ ላይ ያለ ጥሪ ይጨርሱ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"መልዕክት በመላክ አይቀበሉ"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"እንደ ኦዲዮ ጥሪ ይመልሱ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ገቢ ጥሪን ይመልሱ እንዲሁም በመካሄድ ላይ ያለ ጥሪ ይጨርሱ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ቪዲዮ ጠፍቷል"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ለመመለስ በሁለት ጣት ወደ ላይ ያንሸራቱ። ላለመቀበል በሁለት ጣት ወደ ታች ያንሸራቱ።"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ተፈላጊ ጥሪ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
index eb0d45cd0..4ca9e01ec 100644
--- a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"مرّر بشكل سريع من الرمز للرد بمكالمة صوتية"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"التمرير السريع لأعلى للرد وتعليق المكالمة الجارية"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"التمرير السريع لأعلى للرد وإنهاء المكالمة قيد التعليق"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"التمرير السريع من الرمز للرد على المكالمات الواردة وإنهاء المكالمة الجارية"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"التمرير السريع على الرمز للرد وإنهاء مكالمة جارية"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"اكتب ردك…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"جوّال"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"مكبر الصوت"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"إرسال"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"رفض هذه المكالمة مع إرسال رسالة"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"الرد بمكالمة صوتية"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"الرد على مكالمة واردة وإنهاء مكالمة جارية"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"الرد وإنهاء مكالمة جارية"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"الرفض مع إرسال رسالة"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"الرد بمكالمة صوتية"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"الرد على مكالمة واردة وإنهاء مكالمة جارية"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"الرد وإنهاء مكالمة جارية"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"الفيديو قيد إيقاف التشغيل"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"مرر بأصبعين لأعلى للرد. مرر بأصبعين لأسفل للرفض."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"مكالمة مهمة"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
index 2bd02ac90..f0c800f5f 100644
--- a/java/com/android/incallui/answer/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Audio çağrı kimi cavab vermək üçün ikonadan sürüşdürün"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Cavab vermək üçün yuxarı sürüşdürün və gedən zəngi gözlədin"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cavab vermək üçün yuxarı sürüşdürün və gözləmədə olan zəngi bitirin"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Gələn zəngə cavab vermək üçün ikonadan sürüşdürün və gedən zəngi bitirin"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Cavab vermək üçün ikonadan sürüşdürün və gedən zəngi bitirin"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Özünüzünkünü yazın…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Dəstək"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spiker"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Göndərin"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu zəngi mesajla rədd edin"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Audio çağrı olaraq cavab verin"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Gələn zəngə cavab verin və gedən zəngi bitirin"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Cavab verin və gedən zəngi bitirin"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Mesaj ilə rədd edin"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Audio çağrı olaraq cavab verin"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Gələn zəngə cavab verin və gedən zəngi bitirin"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Cavab verin və gedən zəngi bitirin"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoları deaktivdir"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cavab vermək üçün iki barmaq ilə yuxarı sürüşdürün. İmtina etmək üçün iki barmaq ilə aşağı sürüşdürün."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Vacib zəng"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
index 52dc74ff9..975b63535 100644
--- a/java/com/android/incallui/answer/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Правядзіце пальцам ад значка, каб адказаць на аўдыявыклік"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Правядзіце пальцам уверх, каб адказаць і ўтрымаць бягучы выклік"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Правядзіце пальцам уверх, каб адказаць і завяршыць выклік на ўтрыманні"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Правядзіце пальцам ад значка, каб адказаць на ўваходны вынік і завяршыць бягучы выклік"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Правядзіце пальцам ад значка, каб адказаць і скончыць бягучы выклік"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Свой варыянт..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Тэлефон"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Вонкавы дынамік"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Адправіць"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Адхіліць гэты выклік, адправіўшы паведамленне"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Адказаць аўдыявыклікам"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Адказаць на ўваходны вынік і завяршыць бягучы выклік"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Адказаць і скончыць бягучы выклік"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Адхіліць, адправіўшы паведамленне"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Адказаць аўдыявыклікам"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Адказаць на ўваходны вынік і завяршыць бягучы выклік"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Адказаць і скончыць бягучы выклік"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Відэа адключана"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Правядзіце двума пальцамі ўверх, каб адказаць; двума пальцамі ўніз – каб адхіліць."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важны выклік"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
index 972ad5423..6d75a9f84 100644
--- a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Прекарайте пръст от иконата, за да отговорите като аудиообаждане"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Прекарайте пръст нагоре, за да отговорите и да задържите текущото обаждане"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Прекарайте пръст нагоре, за да отговорите и да завършите задържаното обаждане"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Прекарайте пръст нагоре, за да отговорите на входящото обаждане и да завършите текущото"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Прекарайте пръст от иконата, за да отговорите и да завършите текущото обаждане"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишете свое собствено…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Слушалка"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Високоговорител"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Изпращане"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Отхвърляне на това обаждане със съобщение"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Отговаряне като аудиообаждане"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Отговор на входящото обаждане и завършване на текущото"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Отговор и завършване на текущото обаждане"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Отхвърляне със съобщение"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Отговаряне като аудиообаждане"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Отговор на входящото обаждане и завършване на текущото"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Отговор и завършване на текущото обаждане"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видеото е изключено"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Прекарайте два пръста нагоре за отговаряне, надолу за отхвърляне."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важно обаждане"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
index 6ad8aaf3d..2143d34ca 100644
--- a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"একটি অডিও কল হিসেবে উত্তর দিতে আইকন থেকে সোয়াইপ করুন"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"উত্তর দিতে এবং চালু থাকা কল হোল্ড করতে উপরের দিকে সোয়াইপ করুন"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ইনকামিং কলের উত্তর দিতে এবং চালু থাকা কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"উত্তর দিতে এবং চলছে এমন কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"আপনার নিজের পছন্দ মত লিখুন…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"হ্যান্ডসেট"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"স্পিকারফোন"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"পাঠান"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"একটি বার্তা সহ এই কলটি প্রত্যাখ্যান করুন"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"উত্তর দিন এবং  চলছে এমন কল কেটে দিন"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"বার্তা সহ প্রত্যাখ্যান করুন"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"উত্তর দিন এবং  চলছে এমন কল কেটে দিন"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ভিডিও বন্ধ আছে"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"গুরুত্বপূর্ণ কল"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
index b8b131a3a..fae26362d 100644
--- a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prevucite preko ikone da prihvatite kao audiopoziv"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prevucite nagore da odgovorite na poziv koji je u toku i da ga stavite na čekanje"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da odgovorite na poziv i završite poziv koji je na čekanju"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Prevucite ikonu da odgovorite na dolazni poziv i završite poziv koji je u toku"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite ikonu da odgovorite na poziv i završite ga"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite svoj…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalice"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvučnik"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbij poziv porukom"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Odgovorite na dolazni poziv i završite poziv koji je u toku"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odgovorite na poziv i završite ga"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbij porukom"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Odgovorite na dolazni poziv i završite poziv koji je u toku"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i završite ga"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite pomoću dva prsta prema gore da odgovorite. Prevucite pomoću dva prsta prema dolje da odbijete."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Važan poziv"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
index 7a9f1a88a..30e445799 100644
--- a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Llisca des de la icona per respondre amb una trucada d\'àudio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Llisca cap amunt per respondre a la trucada i posar l\'actual en espera"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Llisca cap amunt per respondre a la trucada i finalitzar la que està en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Llisca des de la icona per respondre a la trucada entrant i finalitzar l\'actual"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Llisca des de la icona per respondre a la trucada i finalitzar l\'actual"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escriu la teva…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Auricular"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Telèfon amb altaveu"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envia"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rebutja aquesta trucada amb un missatge"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Respon amb una trucada d\'àudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Respon a la trucada entrant i finalitza l\'actual"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Respon a la trucada i finalitza l\'actual"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rebutja amb un missatge"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Respon amb una trucada d\'àudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Respon a la trucada entrant i finalitza l\'actual"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Respon a la trucada i finalitza l\'actual"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo està desactivat"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Llisca amb dos dits cap amunt per respondre a la trucada i cap avall per rebutjar-la."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Trucada important"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
index 4672a340c..06dd6d0d3 100644
--- a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Přejetím prstem od ikony hovor přijmete jako hlasový hovor"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Přejetím prstem nahoru hovor přijmete a probíhající hovor podržíte"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Přejetím prstem nahoru hovor přijmete a podržený hovor ukončíte"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Přejetím prstem od ikony hovor přijmete a probíhající hovor ukončíte"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Přejetím prstem od ikony hovor přijmete a probíhající hovor ukončíte"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napište vlastní odpověď…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Sluchátko"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hlasitý odposlech"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odeslat"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odmítnout hovor a poslat zprávu"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Přijmout jako hlasový hovor"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Přijmout příchozí hovor a ukončit probíhající hovor"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Přijmout hovor a ukončit probíhající hovor"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odmítnout a poslat zprávu"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Přijmout jako hlasový hovor"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Přijmout příchozí hovor a ukončit probíhající hovor"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Přijmout hovor a ukončit probíhající hovor"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Přejetím dvěma prsty nahoru hovor přijmete. Přejetím dvěma prsty dolů jej odmítnete."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Důležitý hovor"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
index 904b88ce0..bfaebdf2f 100644
--- a/java/com/android/incallui/answer/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Stryg fra ikonet for at besvare som et taleopkald"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Stryg op for at besvare og sætte det igangværende opkald i venteposition"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Stryg op for at besvare og afslutte opkaldet i venteposition"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Stryg fra ikonet for at besvare det indgående opkald og afslutte opkaldet i venteposition"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Stryg fra ikonet for at besvare og afslutte det igangværende opkald"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv dit eget…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Håndsæt"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Medhør"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Afvis dette opkald med en besked"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Besvar som taleopkald"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Besvar det indgående opkald, og afslut det igangværende opkald"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Besvar, og afslut det igangværende opkald"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Afvis med en besked"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Besvar som taleopkald"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Besvar det indgående opkald, og afslut det igangværende opkald"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Besvar, og afslut det igangværende opkald"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er deaktiveret"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Stryg op med to fingre for at besvare. Stryg ned med to fingre for at afvise."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Vigtigt opkald"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
index d4cab75ac..fc4b530d6 100644
--- a/java/com/android/incallui/answer/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Zum Annehmen als Sprachanruf vom Symbol wegwischen"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Wische nach oben, um den Anruf anzunehmen und den aktuellen Anruf zu halten"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Wische nach oben, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Wische vom Symbol weg, um den eingehenden Anruf anzunehmen und den aktuellen Anruf zu beenden"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Wische vom Symbol weg, um den Anruf anzunehmen und den aktuellen Anruf zu beenden"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigene Antwort schreiben…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Mobiltelefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Freisprechfunktion"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senden"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Diesen Anruf mit einer Nachricht ablehnen"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Nimm den eingehenden Anruf an und beende den aktuellen Anruf"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Nimm den Anruf an und beende den aktuellen Anruf"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Mit Nachricht ablehnen"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Nimm den eingehenden Anruf an und beende den aktuellen Anruf"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Nimm den Anruf an und beende den aktuellen Anruf"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video deaktiviert"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Wichtiger Anruf"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
index bc1fa1b6c..8bf79b0a5 100644
--- a/java/com/android/incallui/answer/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση ως φωνητική κλήση"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Σύρετε προς τα επάνω για απάντηση και κράτηση της κλήσης σε εξέλιξη"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Σύρετε προς τα επάνω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση της εισερχόμενης και τερματισμό της κλήσης σε εξέλιξη"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Συντάξτε το δικό σας…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Συσκευή"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Ανοιχτή ακρόαση"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Αποστολή"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Απόρριψη αυτής της κλήσης με μήνυμα"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Απάντηση ως φωνητική κλήση"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Απάντηση εισερχόμενης κλήσης και τερματισμός εκείνης σε εξέλιξη"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Απάντηση και τερματισμός κλήσης σε εξέλιξη"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Απόρριψη με μήνυμα"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Απάντηση ως φωνητική κλήση"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Απάντηση εισερχόμενης κλήσης και τερματισμός εκείνης σε εξέλιξη"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Απάντηση και τερματισμός κλήσης σε εξέλιξη"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Το βίντεο είναι ανενεργό"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Σύρετε με δύο δάχτυλα, προς τα επάνω για απάντηση και προς τα κάτω για απόρριψη."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Σημαντική κλήση"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
index 4566c4159..5381d2c2b 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Swipe from icon to answer incoming call and end ongoing call"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Important call"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
index 4566c4159..5381d2c2b 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Swipe from icon to answer incoming call and end ongoing call"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Important call"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
index 4566c4159..5381d2c2b 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Swipe from icon to answer incoming call and end ongoing call"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Answer incoming call and end ongoing call"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Important call"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
index 123f3c352..b5a8fc630 100644
--- a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Desliza desde el ícono para responder como una llamada de audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder y poner en espera la llamada en curso"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder y finalizar la llamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Desliza el dedo desde el ícono para responder la llamada entrante y finalizar la llamada en curso"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Desliza el dedo desde el ícono para responder y finalizar la llamada en curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe tu propia respuesta…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Auricular"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altavoz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rechazar esta llamada con un mensaje"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responder como llamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder la llamada entrante y finalizar la llamada en curso"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responder y finalizar la llamada en curso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rechazar con un mensaje"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responder como llamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responder la llamada entrante y finalizar la llamada en curso"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder y finalizar la llamada en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El video está desactivado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Llamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
index 8b6c9fa4c..1b2642cd1 100644
--- a/java/com/android/incallui/answer/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Desliza desde el icono para responder como una llamada de audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder a una llamada y para poner en espera la llamada en curso"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder a una llamada y para finalizar la llamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Desliza el dedo desde el icono para responder a una llamada entrante y para finalizar la llamada en curso"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Desliza el dedo desde el icono para responder a una llamada y para finalizar otra en curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe tu propia respuesta…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Auricular"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altavoz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rechaza esta llamada con un mensaje"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responde como llamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder a una llamada entrante y finalizar una llamada en curso"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responder a una llamada y finalizar otra en curso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rechaza con un mensaje"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responde como llamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responder a una llamada entrante y finalizar una llamada en curso"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder a una llamada y finalizar otra en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo está desconectado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Llamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
index 8448ddca7..ac9379910 100644
--- a/java/com/android/incallui/answer/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Helikõnena vastamiseks pühkige ikoonilt eemale"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pühkige üles, et vastata ja käimasolev kõne ootele panna"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pühkige üles, et vastata ja ootel kõne lõpetada"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Pühkige ikoonilt eemale, et sissetulevale kõnele vastata ja käimasolev kõne lõpetada"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pühkige ikoonilt eemale, et vastata ja käimasolev kõne lõpetada"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjutage ise …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Käsitelefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Valjuhääldi"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Saada"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Keeldu kõnest ja saada sõnum"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Vasta helikõnena"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Vastake sissetulevale kõnele ja lõpetage käimasolev kõne"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Vastake ja lõpetage käimasolev kõne"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Keeldumine ja sõnumi saatmine"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Vastamine helikõnena"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Vastake sissetulevale kõnele ja lõpetage käimasolev kõne"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastake ja lõpetage käimasolev kõne"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video on välja lülitatud"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastamiseks pühkige kahe sõrmega üles. Keeldumiseks pühkige kahe sõrmega alla."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Tähtis kõne"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
index 82d7efe44..341b9d2db 100644
--- a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Pasatu hatza ikonotik audio-dei gisa erantzuteko"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pasatu hatza gorantz erantzuteko eta uneko deia zain jartzeko"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasatu hatza gorantz erantzuteko eta zain dagoen deia amaitzeko"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Pasatu hatza ikonotik deiari erantzuteko eta uneko deia amaitzeko"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasatu hatza ikonotik erantzuteko eta uneko deia amaitzeko"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Idatzi erantzuna…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefonoa"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Bozgorailua"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Bidali"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Baztertu dei hau eta bidali mezu bat"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Erantzun audio-dei gisa"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Erantzun deiari eta amaitu uneko deia"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Erantzun eta amaitu uneko deia"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Baztertu eta bidali mezu bat"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Erantzun audio-dei gisa"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Erantzun deiari eta amaitu uneko deia"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Erantzun eta amaitu uneko deia"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Desaktibatuta dago kamera"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasatu bi hatz gora erantzuteko; eta behera, baztertzeko."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Dei garrantzitsua"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
index e39a01520..76725f25a 100644
--- a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"برای پاسخ دادن با تماس صوتی، انگشتتان را تند از روی نماد بکشید"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"برای پاسخ دادن و در انتظار نگه‌داشتن تماس درحال انجام، تند به بالا بکشید"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"برای پاسخ دادن و پایان دادن به تماس در انتظار، تند به بالا بکشید"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"برای پاسخ دادن به تماس ورودی و پایان دادن به تماس درحال انجام، صفحه را تند از نماد بکشید"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"برای پاسخ دادن به تماس درحال انجام و پایان دادن به آن، انگشتتان را تند از روی نماد بکشید"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"بنویسید..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"گوشی"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"بلندگوی تلفن"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ارسال"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"رد کردن تماس با ارسال پیام"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"پاسخ با تماس صوتی"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"پاسخ دادن به تماس ورودی و پایان دادن به تماس درحال انجام"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"پاسخ دادن به تماس درحال انجام و پایان دادن به آن"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"رد کردن با ارسال پیام"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"پاسخ با تماس صوتی"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"پاسخ دادن به تماس ورودی و پایان دادن به تماس درحال انجام"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"پاسخ دادن به تماس درحال انجام و پایان دادن به آن"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ویدیو خاموش است"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"برای پاسخ‌گویی، دو انگشتتان را تند به بالا بکشید و برای رد کردن به پایین بکشید."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"تماس مهم"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
index e227986c7..da7da4ae7 100644
--- a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Vastaa äänipuheluna pyyhkäisemällä kuvaketta."</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Laita nykyinen puhelu pitoon ja vastaa saapuvaan puheluun pyyhkäisemällä ylös"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun pyyhkäisemällä ylös"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun pyyhkäisemällä kuvakkeesta"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vastaa puheluun ja lopeta nykyinen puhelu pyyhkäisemällä kuvakkeesta."</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjoita oma…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Matkapuhelin"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Kaiutinpuhelin"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Lähetä"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hylkää tämä puhelu viestillä."</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Vastaa ja aloita äänipuhelu."</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Vastaa puheluun ja lopeta nykyinen puhelu"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Hylkää viestillä"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Vastaa ja aloita äänipuhelu"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastaa puheluun ja lopeta nykyinen puhelu"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokuva ei ole käytössä."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastaa pyyhkäisemällä ylös kahdella sormella. Hylkää pyyhkäisemällä alas kahdella sormella."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Tärkeä puhelu"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
index 10a7a6a75..733dd4382 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Balayez à partir de l\'icône pour répondre par appel audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Balayez l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayez l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Balayez l\'écran à partir de l\'icône pour répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Balayez l\'écran à partir de l\'icône pour répondre et mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Combiné"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Téléphone à haut-parleur"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuser l\'appel et envoyer un message à l\'appelant"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Répondre par appel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Répondre et mettre fin à l\'appel en cours"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuser avec un message"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Répondre par appel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre et mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez vers le haut avec deux doigts pour répondre. Balayez vers le bas avec deux doigts pour refuser."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Appel important"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
index cbd20c98d..88e5b829f 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre via un appel audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Balayer l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayer l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre ou mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Combiné"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Haut-parleur"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuser cet appel et envoyer un message à l\'appelant"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Répondre via un appel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Répondre ou mettre fin à l\'appel en cours"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuser avec envoi de message"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Répondre via un appel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Répondre à l\'appel entrant et mettre fin à l\'appel en cours"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre ou mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez l\'écran avec deux doigts vers le haut pour répondre, ou vers le bas pour refuser l\'appel."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Appel important"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
index 2025f41d9..79cf1b114 100644
--- a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Pasar o dedo desde a icona para responder como chamada de audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pasa o dedo cara arriba para responder e poñer en espera a chamada en curso"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasa o dedo cara arriba para responder e finalizar a chamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe a túa propia…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Teléfono"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altofalante"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rexeitar a chamada cunha mensaxe"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responder como chamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder á chamada entrante e finalizar chamada en curso"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responde á chamada entrante e finaliza a chamada en curso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rexeitar con mensaxe"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responder como chamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responde á chamada entrante e finaliza a chamada en curso"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responde á chamada entrante e finaliza a chamada en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desactivado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Chamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
index 7b7e41d0e..928228653 100644
--- a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ઑડિઓ કૉલનો જવાબ આપવા માટે આઇકનથી સ્વાઇપ કરો"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"જવાબ આપવા અને ચાલુ કૉલ હૉલ્ડ પર રાખવા માટે ઉપર સ્વાઇપ કરો"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"જવાબ આપવા અને હૉલ્ડ પરનો કૉલ સમાપ્ત કરવા માટે ઉપર સ્વાઇપ કરો"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ઇનકમિંગ કૉલનો જવાબ આપવા અને ચાલુ કૉલ સમાપ્ત કરવા માટે આઇકનમાંથી સ્વાઇપ કરો"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"જવાબ આપવા અને ચાલુ કૉલ સમાપ્ત કરવા માટે આઇકનમાંથી સ્વાઇપ કરો"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"તમારો પોતાનો સંદેશ લખો…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"હેન્ડસેટ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"સ્પીકરફોન"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"મોકલો"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"આ કૉલને સંદેશ સાથે નકારો"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ઑડિઓ કૉલ તરીકે જવાબ આપો"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ઇનકમિંગ કૉલનો જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"સંદેશ સાથે નકારો"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ઑડિઓ કૉલ તરીકે જવાબ આપો"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ઇનકમિંગ કૉલનો જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"વિડિઓ બંધ છે"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"જવાબ આપવા માટે બે આંગળી ઉપર સ્વાઇપ કરો. નકારવા માટે બે આંગળી નીચે સ્વાઇપ કરો."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"મહત્વપૂર્ણ કૉલ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
index 6778511ed..88c0ad21c 100644
--- a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ऑडियो कॉल के रूप में उत्तर देने के लिए आइकन से स्वाइप करें"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"जवाब देने और जारी कॉल को होल्ड पर रखने के लिए ऊपर स्वाइप करें"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाब देने और होल्ड पर रखा कॉल समाप्त करने के लिए ऊपर स्वाइप करें"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"इनकमिंग कॉल का जवाब देने और जारी कॉल समाप्त करने के लिए आइकन से स्वाइप करें"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"कॉल का जवाब देने और जारी कॉल समाप्त करने के लिए आइकन से स्वाइप करें"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"अपना स्वयं का लिखें…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"हैंडसेट"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"स्‍पीकर फ़ोन"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"भेजें"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"इस कॉल को संदेश के साथ अस्वीकार करें"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ऑडियो कॉल के रूप में उत्तर दें"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"इनकमिंग कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"संदेश के साथ अस्वीकार करें"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ऑडियो कॉल के रूप में उत्तर दें"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"इनकमिंग कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"वीडियो बंद है"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"जवाब देने के लिए दो अंगुलियों से ऊपर स्वाइप करें. अस्वीकार करने के लिए दो अंगुलियों से नीचे स्वाइप करें."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"महत्वपूर्ण कॉल"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
index 5f2711020..a7524a34f 100644
--- a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prijeđite prstom od ikone da biste prihvatili kao audiopoziv"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prijeđite prstom prema gore za odgovor na poziv i stavljanje poziva u tijeku na čekanje"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prijeđite prstom prema gore za odgovor na poziv i prekidanje poziva na čekanju"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Prijeđite prstom od ikone da biste prihvatili dolazni poziv i prekinuli poziv u tijeku"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prijeđite prstom od ikone da biste prihvatili poziv i prekinuli poziv u tijeku"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite vlastiti…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalice"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvučnik"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbijte ovaj poziv porukom"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prihvatte kao audiopoziv"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Odgovorite na dolazni poziv i prekinite poziv u tijeku"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odgovorite na poziv i prekinite poziv u tijeku"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbij pomoću poruke"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Odgovorite na dolazni poziv i prekinite poziv u tijeku"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i prekinite poziv u tijeku"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokamera je isključena"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prijeđite dvama prstima prema gore za odgovor, a dvama prstima prema dolje za odbijanje."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Važan poziv"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
index baf051c35..ced3e2763 100644
--- a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Csúsztassa el az ujját az ikonról a hanghívásként való fogadáshoz"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Csúsztassa felfelé az ujját a hívás fogadásához és a folyamatban lévő hívás tartásához"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Csúsztassa felfelé az ujját a hívás fogadásához és a várakoztatott hívás befejezéséhez"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Csúsztassa el az ujját az ikontól a bejövő hívás fogadásához és a folyamatban lévő hívás befejezéséhez"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Csúsztassa el az ujját az ikontól a hívásfogadáshoz és a folyamatban lévő hívás befejezéséhez"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Saját válasz írása…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Kézibeszélő"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Kihangosító"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Küldés"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hívás elutasítása üzenettel"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Fogadás hanghívásként"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"A bejövő hívás fogadása és a folyamatban lévő hívás befejezése"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Hívásfogadás és a folyamatban lévő hívás befejezése"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Elutasítás üzenettel"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Fogadás hanghívásként"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"A bejövő hívás fogadása és a folyamatban lévő hívás befejezése"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Hívásfogadás és a folyamatban lévő hívás befejezése"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"A videokép ki van kapcsolva"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Csúsztassa felfelé két ujját a hívás fogadásához. Csúsztassa lefelé két ujját a hívás elutasításához."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Fontos hívás"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
index 3fc30b6dd..dfa550be9 100644
--- a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Պատկերակից մատով մի կողմ սահեցրեք՝ զանգին անջատված տեսախցիկով պատասխանելու համար"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Սահեցրեք վերև՝ պատասխանելու և ընթացիկ զանգը պահելու համար"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Սահեցրեք վերև՝ պատասխանելու և սպասման մեջ գտնվող զանգն ավարտելու համար"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Պատկերակից մատով մի կողմ սահեցրեք՝ մուտքային զանգին պատասխանելու և ընթացիկ զանգն ավարտելու համար"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Պատկերակից մատով մի կողմ սահեցրեք՝ պատասխանելու և ընթացիկ զանգն ավարտելու համար"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Գրեք ձեր պատասխանը…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Լսափող"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Բարձրախոս"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ուղարկել"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Մերժել զանգը՝ ուղարկելով հաղորդագրություն"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Պատասխանել անջատած տեսախցիկով"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Պատասխանել մուտքային զանգին և ավարտել ընթացիկ զանգը"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Պատասխանել և ավարտել ընթացիկ զանգը"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Մերժել՝ ուղարկելով հաղորդագրություն"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"պատասխանել անջատված տեսախցիկով"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Պատասխանել մուտքային զանգին և ավարտել ընթացիկ զանգը"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Պատասխանել և ավարտել ընթացիկ զանգը"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Տեսախցիկն անջատած է"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Պատասխանելու համար երկու մատով սահեցրեք վերև, մերժելու համար՝ ներքև:"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Կարևոր զանգ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
index 96e1f174d..16d3058c7 100644
--- a/java/com/android/incallui/answer/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Geser dari ikon untuk menjawab sebagai panggilan audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Geser ke atas untuk menjawab dan menangguhkan panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Geser ke atas untuk menjawab dan mengakhiri panggilan yang ditangguhkan"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Geser dari ikon untuk menjawab panggilan masuk dan mengakhiri panggilan yang sedang berlangsung"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Geser dari ikon untuk menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis respons Anda sendiri…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speaker ponsel"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Kirim"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tolak panggilan ini dengan pesan"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Menjawab panggilan masuk dan mengakhiri panggilan yang sedang berlangsung"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tolak dengan pesan"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Menjawab panggilan masuk dan mengakhiri panggilan yang sedang berlangsung"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video nonaktif"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Geser ke atas dengan dua jari untuk menjawab. Geser ke bawah dengan dua jari untuk menolak."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Panggilan penting"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
index 47a4eecac..fe2a2be59 100644
--- a/java/com/android/incallui/answer/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Strjúktu frá tákninu til að svara sem símtali"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Strjúktu upp til að svara og setja yfirstandandi símtal í bið"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Strjúktu upp til að svara og ljúka símtali í bið"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Strjúktu frá tákninu til að svara símtali sem berst og ljúka yfirstandandi símtali"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Strjúktu frá tákninu til að svara og ljúka yfirstandandi símtali"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skrifaðu þitt eigið…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Símtól"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hátalari"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senda"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hafna símtalinu með skilaboðum"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svara sem símtali"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Svara símtali sem berst og ljúka yfirstandandi símtali"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svara og ljúka yfirstandandi símtali"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Hafna með skilaboðum"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svara sem símtali"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Svara símtali sem berst og ljúka yfirstandandi símtali"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara og ljúka yfirstandandi símtali"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Slökkt á myndavél"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Strjúktu upp með tveimur fingrum til að svara. Strjúktu niður með tveimur fingrum til að hafna."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Mikilvægt símtal"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
index a8fc7cc0f..ab69bb9bf 100644
--- a/java/com/android/incallui/answer/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Fai scorrere dall\'icona per rispondere con una chiamata audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Fai scorrere verso l\'alto per rispondere e mettere in attesa la chiamata in corso"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Fai scorrere verso l\'alto per rispondere e terminare la chiamata in attesa"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Fai scorrere dall\'icona per rispondere alla chiamata in arrivo e terminare la chiamata in corso"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Fai scorrere dall\'icona per rispondere e terminare la chiamata in corso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrivi risposta personale…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Ricevitore"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Vivavoce"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Invia"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rifiuta questa chiamata con un messaggio"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Rispondi con chiamata audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Rispondi alla chiamata in arrivo e termina la chiamata in corso"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Rispondi e termina la chiamata in corso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rifiuta con messaggio"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Rispondi con chiamata audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Rispondi alla chiamata in arrivo e termina la chiamata in corso"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Rispondi e termina la chiamata in corso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Il video è disattivato"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Fai scorrere con due dita verso l\'alto per rispondere e verso il basso per rifiutare."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Chiamata importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
index 19321c7cb..7acc3f4bc 100644
--- a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"החלק מהסמל כדי לענות כשיחת אודיו"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"החלק למעלה כדי לענות ולהעביר את השיחה הנוכחית להמתנה"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"החלק למעלה כדי לענות ולסיים את השיחה שבהמתנה"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"החלק מהסמל כדי לענות לשיחה הנכנסת ולסיים את השיחה הנוכחית"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"החלק מהסמל כדי לענות ולסיים שיחה"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"כתוב אחת משלך…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"אוזניה"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"רמקול"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"שלח"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"דחה את השיחה הזו עם הודעה"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ענה כשיחת אודיו"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"מענה לשיחה הנכנסת וסיום השיחה הנוכחית"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"מענה וסיום שיחה"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"דחה עם הודעה"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ענה כשיחת אודיו"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"מענה לשיחה הנכנסת וסיום השיחה הנוכחית"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"מענה וסיום שיחה"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"הווידאו מושבת"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"החלק עם שתי אצבעות למעלה כדי לענות או למטה כדי לדחות."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"שיחה חשובה"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
index 7e573071d..a3513e2f2 100644
--- a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"アイコンをスワイプして音声通話として応答"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"上にスワイプして通話に応答し、進行中の通話を保留"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"上にスワイプして通話に応答し、保留中の通話を終了"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"アイコンをスワイプして着信中の通話に応答し、進行中の通話を終了"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"アイコンをスワイプして通話に応答し、進行中の通話を終了"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"カスタム返信を作成…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ハンドセット"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"スピーカーフォン"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"送信"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"この着信を拒否してメッセージを送信"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"音声通話として応答"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"着信中の通話に応答し、進行中の通話を終了"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"通話に応答し、進行中の通話を終了"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒否してメッセージを送信"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"音声通話として応答"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"着信中の通話に応答し、進行中の通話を終了"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"通話に応答し、進行中の通話を終了"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ビデオ: OFF"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"重要な通話"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
index 861e85ce3..662936ba8 100644
--- a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"გადაუსვით ხატულადან აუდიოზარით საპასუხოდ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"მიმდინარე ზარის საპასუხოდ და შესაყოვნებლად გადაფურცლეთ ზემოთ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"შეყოვნებული ზარის საპასუხოდ და დასასრულებლად გადაფურცლეთ ზემოთ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"შემომავალი ზარის საპასუხოდ და მიმდინარე ზარის დასასრულებლად გადაუსვით ხატულას"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"მიმდინარე ზარის საპასუხოდ და დასასრულებლად გადაუსვით ხატულას"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"დაწერეთ თქვენი საკუთარი…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ყურსასმენი"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"სპიკერები"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"გაგზავნა"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ამ ზარის უარყოფა შეტყობინებით"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"პასუხი აუდიოზარის სახით"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"შემომავალ ზარზე პასუხი და მიმდინარე ზარის დასრულება"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"პასუხი და მიმდინარე ზარის დასრულება"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"უარყოფა შეტყობინებით"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"პასუხი აუდიოზარის სახით"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"შემომავალ ზარზე პასუხი და მიმდინარე ზარის დასრულება"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"პასუხი და მიმდინარე ზარის დასრულება"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ვიდეო გამორთულია"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"საპასუხოდ გადაფურცლეთ ზემოთ ორი თითით. უარყოფისთვის გადაფურცლეთ ქვემოთ ორი თითით."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"მნიშვნელოვანი ზარი"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
index 5b6199ae7..b37695be9 100644
--- a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио қоңырау ретінде жауап беру үшін, белгішеден әрі қарай сырғытыңыз"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Ағымдағы қоңырауға жауап беру және оны ұстап тұру үшін жоғары сырғытыңыз"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Күту күйіндегі қоңырауға жауап беру және оны аяқтау үшін жоғары сырғытыңыз"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Келген қоңырауға жауап беру және ағымдағы қоңырауды аяқтау үшін белгішеден сырғытыңыз"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Қоңырауға жауап беру үшін және ағымдағы қоңырауды аяқтау үшін белгішеден сырғытыңыз"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Өзіңіз жазыңыз…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Телефон"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Спикерфон"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жіберу"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Бұл қоңырауды қабылдамай, хабар жіберу"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио қоңырау ретінде жауап беру"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Келген қоңырауға жауап беріңіз және ағымдағы қоңырауды аяқтаңыз"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Қабылдамай, хабар жіберу"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио қоңырау ретінде жауап беру"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Келген қоңырауға жауап беріңіз және ағымдағы қоңырауды аяқтаңыз"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Бейне өшірулі"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Жауап беру үшін екі саусақпен жоғары сырғытылады. Қабылдамау үшін екі саусақпен төмен сырғытылады."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Маңызды қоңырау"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
index 6d021dff3..03e48e3be 100644
--- a/java/com/android/incallui/answer/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​ឆ្លើយ​​​ជា​ការ​ហៅ​សំឡេង"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​រង់ចាំ​ការ​ហៅ​ដែល​កំពុង​ដំណើរការ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ដែល​កំពុង​រង់ចាំ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"អូស​ពី​រូបតំណាង ដើម្បី​ឆ្លើយ​ការ​ហៅ​ចូល និង​បញ្ចប់​ការ​ហៅ​ដែល​កំពុង​ដំណើរការ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"អូស​ពី​រូបតំណាង ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"សរសេរ​ផ្ទាល់ខ្លួន​​​អ្នក…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ផ្នែកកាន់​​នៃ​ទូរសព្ទ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ឧបករណ៍​បំពង​សំឡេង​ទូរសព្ទ"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ផ្ញើ"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"បដិសេធ​ការ​ហៅ​នេះ​​ដោយ​មាន​សារ​មួយ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ឆ្លើយ​ការ​ហៅ​ចូល និង​បញ្ចប់​ការហៅ​ដែល​កំពុង​ដំណើរការ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"បដិសេធ​​ដោយ​មាន​សារ"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ឆ្លើយ​ការ​ហៅ​ចូល និង​បញ្ចប់​ការ​ហៅ​​ដែល​កំពុង​ដំណើរការ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"វីដេអូត្រូវបានបិទ"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"អូស​ម្រាម​ដៃ​ពីរ​ឡើងលើ​ ដើម្បី​ឆ្លើយ។ អូស​ម្រាមដៃ​ពីរ​ចុះ​ក្រោម​ ដើម្បី​បដិសេធ។"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ការ​ហៅ​ដែល​សំខាន់"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
index 6e4ac93c5..8c8c7d5c0 100644
--- a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ಆಡಿಯೊ ಕರೆ ರೀತಿಯಲ್ಲಿ ಉತ್ತರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಹೋಲ್ಡ್ ಮಾಡಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಹೋಲ್ಡ್‌ನಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ಒಳಬರುವ ಕರೆಗೆ ಉತ್ತರಿಸಲು ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಲು ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ಹ್ಯಾಂಡ್‌ಸೆಟ್"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ಸ್ಪೀಕರ್‌ಫೋನ್"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ಕಳುಹಿಸು"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ಸಂದೇಶದ ಮೂಲಕ ಈ ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಿ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ಒಳಬರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ಸಂದೇಶದೊಂದಿಗೆ ತಿರಸ್ಕರಿಸು"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ಒಳಬರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ. ನಿರಾಕರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ಪ್ರಮುಖ ಕರೆ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
index 5ce6d929e..795b176ba 100644
--- a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"음성 통화로 받으려면 아이콘에서 스와이프하세요."</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"현재 통화를 끊지 않고 받으려면 위로 스와이프"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"대기 중 통화를 종료하고 받으려면 위로 스와이프"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"현재 통화를 종료하고 수신 전화를 받으려면 아이콘에서 스와이프"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"현재 통화를 종료하고 전화를 받으려면 아이콘에서 스와이프하세요."</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"직접 메시지 쓰기…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"핸드셋"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"스피커폰"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"보내기"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"메시지를 사용하여 이 전화 거부"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"음성 통화로 받기"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"현재 통화를 종료하고 수신 전화 받기"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"현재 통화를 종료하고 전화 받기"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"메시지를 사용하여 전화 거부"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"음성 통화로 받기"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"현재 통화를 종료하고 수신 전화 받기"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"현재 통화를 종료하고 전화 받기"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"동영상이 꺼져 있습니다."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"받으려면 두 손가락을 위로 스와이프하고 거부하려면 두 손가락을 아래로 스와이프하세요."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"중요 전화"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
index f2f33bf51..b8e704ada 100644
--- a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио чалуу катары жооп берүү үчүн сүрөтчөдөн сүрүңүз"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Жооп берүү жана учурдагы чалууну кармоо үчүн экранды өйдө сүрүп коюңуз"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Жооп берүү же кармалып турган чалууну бутүрүү үчүн экранды өйдө сүрүп коюңуз"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Кирүүчү чалууга жооп берүү же чалууну аяктоо үчүн сүрөтчөнү сүрүңүз"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чалууга жооп берүү же чалууну аяктоо үчүн сүрөтчөнү сүрүңүз"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Сиздин жообуңуз..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Трубка"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Динамик"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жөнөтүү"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Бул чалууну билдирүү менен четке кагуу"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио чалуу катары жооп берүү"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Кирүүчү чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Билдирүү менен четке кагуу"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио чалуу катары жооп берүү"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Кирүүчү чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видео өчүк"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Жооп берүү үчүн экранды өйдө сүрүп, четке кагуу үчүн ылдый сүрүп коюңуз."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Маанилүү чалуу"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
index 096d6b1cc..df8fc043e 100644
--- a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ພັກສາຍທີ່ກຳລັງໂທອອກໄວ້ກ່ອນ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງພັກຢູ່"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍທີ່ໂທເຂົ້າ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ຫູຟັງ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ລຳໂພງ"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ສົ່ງ"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ປະຕິເສດສາຍນີ້ພ້ອມສົ່ງຂໍ້ຄວາມ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ຮັບສາຍສະເພາະສຽງ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ຮັບສາຍໂທເຂົ້າ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ປະຕິເສດພ້ອມສົ່ງຂໍ້ຄວາມ"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ຮັບສາຍສະເພາະສຽງ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ຮັບສາຍໂທເຂົ້າ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ວິດີໂອປິດຢູ່"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ປັດສອງນິ້ວຂຶ້ນເພື່ອຮັບສາຍ. ປັດສອງນິ້ວລົງເພື່ອປະຕິເສດ."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ການໂທສຳຄັນ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
index 1579026e1..30ce82f2d 100644
--- a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Perbraukite iš piktogramos, kad atsilieptumėte kaip į garso skambutį"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Perbraukite aukštyn, kad atsakytumėte ir sulaikytumėte vykstantį skambutį"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Perbraukite aukštyn, kad atsakytumėte ir užbaigtumėte sulaikytą skambutį"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Perbraukite iš piktogramos, kad atsakytumėte gaunamąjį skambutį ir užbaigtumėte vykstantį"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Perbraukite iš piktogramos, kad atsakytumėte ir užbaigtumėte vykstantį skambutį"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Parašykite savo…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefono ragelis"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Garsiakalbis"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Siųsti"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Atmesti šį skambutį su pranešimu"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atsiliepti kaip į garso skambutį"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Atsakykite į gaunamąjį skambutį ir užbaikite vykstantį"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atsakykite ir užbaikite vykstantį skambutį"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Atmesti su pranešimu"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atsiliepti kaip į garso skambutį"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Atsakykite į gaunamąjį skambutį ir užbaikite vykstantį"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atsakykite ir užbaikite vykstantį skambutį"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Vaizdas išjungtas"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Perbraukite dviem pirštais aukštyn, kad atsakytumėte. Perbraukite dviem pirštais žemyn, kad atmestumėte."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Svarbus skambutis"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
index a87d9bc58..2f9f2de7e 100644
--- a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Lai atbildētu audiozvanā, velciet no ikonas"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Velciet augšup, lai atbildētu un aizturētu notiekošo zvanu"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Velciet augšup, lai atbildētu un beigtu aizturēto zvanu"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Velciet no ikonas, lai atbildētu uz ienākošo zvanu un beigtu notiekošo zvanu"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Velciet no ikonas, lai atbildētu un beigtu notiekošo zvanu"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Rakstīt savu…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Austiņas"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Skaļrunis"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Sūtīt"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Noraidīt šo zvanu, izmantojot ziņojumu"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atbildēt audiozvanā"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Atbildiet uz ienākošo zvanu un beidziet notiekošo zvanu"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atbildiet un beidziet notiekošo zvanu"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Noraidīt, izmantojot ziņojumu"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atbildēt audiozvanā"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Atbildiet uz ienākošo zvanu un beidziet notiekošo zvanu"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atbildiet un beidziet notiekošo zvanu"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video ir izslēgts"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ar diviem pirkstiem velciet augšup, lai atbildētu. Ar diviem pirkstiem velciet lejup, lai noraidītu."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Svarīgs zvans"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
index 6e82ec1cc..d71e72fdd 100644
--- a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Повлечете од иконата за да одговорите на аудиоповик"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Повлечете нагоре за да одговорите и да ставите на чекање појдовен повик"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Повлечете нагоре за да одговорите и да завршите повик на чекање"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Повлечете од иконата за да одговорите на дојдовен повик и да завршите појдовен повик"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Повлечете од иконата за да одговорите и да го завршите тековниот повик"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишете сопствен…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Слушалка"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Звучник"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Испрати"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Одбијте го повиков со порака"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Одговорете со аудиоповик"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Одговорете на дојдовен повик и завршете појдовен повик"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Одговорете и завршете го тековниот повик"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Одбијте со порака"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Одговорете со аудиоповик"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Одговорете на дојдовен повик и завршете појдовен повик"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Одговорете и завршете го тековниот повик"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видеото е исклучено"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Повлечете нагоре со два прста за да одговорите. Повлечете надолу со два прста за да одбиете."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важен повик"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
index 725cddb7e..9b0c85ff8 100644
--- a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ഒരു ഓഡിയോ കോളായി മറുപടി നൽകാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"നിലവിലുള്ള കോളിന് മറുപടി നൽകാനും അത് ഹോൾഡുചെയ്യാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"മറുപടി നൽകാനും ഹോൾഡിലുള്ള കോൾ അവസാനിപ്പിക്കാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ഇൻകമിംഗ് കോളിന് മറുപടി നൽകാനും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കാനും ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"മറുപടി നൽകാനും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കാനും ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"നിങ്ങളുടേതായത് എഴുതുക…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ഹാൻഡ്സെറ്റ്"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"സ്‌പീക്കർഫോൺ"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"അയയ്‌ക്കുക"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ഒരു സന്ദേശം അയച്ചുകൊണ്ട് ഈ കോൾ നിരസിക്കുക"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ഇൻകമിംഗ് കോളിന് മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ഒരു സന്ദേശം അയച്ചുകൊണ്ട് നിരസിക്കുക"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ഇൻകമിംഗ് കോളിന് മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"വീഡിയോ ഓഫാണ്"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"മറുപടി നൽകാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക. നിരസിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"പ്രധാനപ്പെട്ട കോൾ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
index e7c6ee6c4..06a2f1e25 100644
--- a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио дуудлагаар хариулах бол дүрснээс шударна уу"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Дээш шударч дуудлагыг аваад, одоогийн дуудлагыг түр хүлээлгэх"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Дээш шударч дуудлагыг аваад, түр хүлээлгэсэн дуудлагыг таслах"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Дүрснээс шударч ирсэн дуудлагыг аваад залгасан дуудлагыг таслах"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Дүрснээс шударч ирсэн дуудлагыг аваад одоогийн дуудлагыг таслах"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Өөрийнхөөрөө бичнэ үү…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Чихэвч"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Чанга яригч"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Илгээх"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Энэ дуудлагыг зурвас бичиж таслах"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио дуудлагаар хариулах"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Ирсэн дуудлагыг авч, залгасан дуудлагыг таслах"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Зурвас бичиж таслах"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио дуудлагаар хариулах"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Ирсэн дуудлагыг авч, залгасан дуудлагыг таслах"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видео идэвхгүй байна"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Хариулах бол хоёр хуруугаар дээш шударна уу. Таслах бол хоёр хуруугаар доош шударна уу."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Чухал дуудлага"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
index 05c5d985d..dedb145f3 100644
--- a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ऑडिओ कॉल म्हणून उत्तर देण्यासाठी चिन्हावरुन स्वाइप करा"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"उत्तर देण्यासाठी आणि सुरु असलेला कॉल होल्ड करण्‍यासाठी वर स्वाइप करा"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"उत्तर देण्यासाठी आणि होल्ड केलेला कॉल बंद करण्‍यासाठी वर स्वाइप करा"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"येणार्‍या कॉलला उत्तर देण्‍यासाठी आणि सुरु असलेला कॉल बंद करण्‍यासाठी चिन्हावरून स्वाइप करा"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"उत्तर देण्‍यासाठी आणि सुरु असलेला कॉल बंद करण्‍यासाठी चिन्हावरून स्वाइप करा"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"आपण स्वतःच लिहा…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"हँडसेट"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"स्पीकरफोन"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पाठवा"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"एका संदेशासह या कॉलला नकार द्या"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"येणार्‍या कॉलला उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"संदेशासह नकार द्या"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"येणार्‍या कॉलला उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"व्हिडिओ बंद आहे"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"उत्तर देण्यासाठी दोन बोटांनी वर स्वाइप करा. नकार देण्यासाठी दोन बोटांनी खाली स्वाइप करा."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"महत्त्वाचा कॉल"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
index 8731bdef3..bb5be58c4 100644
--- a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Leret dari ikon untuk menjawab sebagai panggilan audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Leret ke atas untuk menjawab dan menahan panggilan aktif"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Leret ke atas untuk menjawab dan menamatkan panggilan yang ditahan"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Leret dari ikon untuk menjawab panggilan masuk dan menamatkan panggilan aktif"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Leret dari ikon untuk menjawab dan menamatkan panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis mesej anda sendiri…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon bimbit"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Fon pembesar suara"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Hantar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tolak panggilan ini dengan mesej"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Jawab panggilan masuk dan tamatkan panggilan aktif"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Jawab dan tamatkan panggilan yang sedang berlangsung"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tolak dengan mesej"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Jawab panggilan masuk dan tamatkan panggilan aktif"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jawab dan tamatkan panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video dimatikan"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Leret dua jari ke atas untuk menjawab. Leret dua jari ke bawah untuk menolak."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Panggilan penting"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
index 704a3dd5c..4a33bb0f5 100644
--- a/java/com/android/incallui/answer/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"အသံခေါ်ဆိုမှုအဖြစ်ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပါ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို ခဏရပ်ထားပါ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး ကိုင်ထားသောခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"အဝင်ခေါ်ဆိုမှုကို ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"သင့်ကိုယ်ပိုင်ရေးပါ…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"လက်ကိုင်ဖုန်း"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"စပီကာဖုန်း"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ပို့ရန်"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ဤခေါ်ဆိုမှုကို မက်ဆေ့ဂျ်ဖြင့် ငြင်းဆိုရန်"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"အဝင်ခေါ်ဆိုမှုကို ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"မက်ဆေ့ဂျ်ဖြင့် ငြင်းပယ်ရန်"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"အဝင်ခေါ်ဆိုမှုကို ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ဗီဒီယို ပိတ်ထားပါသည်"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ ပွတ်ဆွဲပါ။ ငြင်းပယ်ရန် လက်နှစ်ချောင်းဖြင့် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"အရေးကြီးခေါ်ဆိုမှု"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
index b9cae7da9..fb3538f04 100644
--- a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sveip fra ikonet for å svare med en lydsamtale"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Sveip oppover for å svare og sette samtalen som er i gang på vent"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Sveip fra ikonet for å svare på det innkommende anropet og avslutte samtalen som er i gang"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Høyttaler"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvis anropet med en melding"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svar med en lydsamtale"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvis med en melding"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svar med en lydsamtale"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Viktig samtale"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
index 76b9bcaed..644e9cc19 100644
--- a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"अडियो कलका रूपमा जवाफ फर्काउन आइकनबाट स्वाइप गर्नुहोस्"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"जारी कलको जवाफ दिन र होल्ड गर्न माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाफ दिन र होल्डमा रहेको कल अन्त्य गर्न माथितिर स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"आगमन कलको जवाफ फर्काउन र जारी कललाई अन्त्य गर्न आइकनबाट स्वाइप गर्नुहोस्"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"जवाफ फर्काउन र जारी कललाई अन्त्य गर्न आइकनबाट स्वाइप गर्नुहोस्"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"तपाईँको आफ्नै लेख्नुहोस्…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ह्यान्डसेट"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"स्पिकरफोन"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पठाउनुहोस्"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"एउटा सन्देश पठाउँदै यो कल अस्वीकार गर्नुहोस्"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"अडियो कलका रूपमा जवाफ दिनुहोस्"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"आगमन कलको जवाफ दिनुहोस् र जारी कल अन्त्य गर्नुहोस्"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"सन्देश सहित अस्वीकार गर्नुहोस्"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"अडियो कलका रूपमा जवाफ दिनुहोस्"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"आगमन कलको जवाफ दिनुहोस् र जारी कल अन्त्य गर्नुहोस्"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"भिडियो निष्क्रिय छ"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"जवाफ दिन दुई औंलाले माथितिर स्वाइप गर्नुहोस्। अस्वीकार गर्न दुई औंलाले तलतिर स्वाइप गर्नुहोस्।"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"महत्त्वपूर्ण कल"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
index 55f849999..830faecaf 100644
--- a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Veeg vanaf pictogram om te beantwoorden als audiogesprek"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Veeg omhoog om op te nemen en actieve oproep in de wacht te plaatsen"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Veeg omhoog om op te nemen en oproep in de wacht te beëindigen"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Veeg vanaf pictogram om inkomende oproep te beantwoorden en actieve oproep te beëindigen"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Veeg vanaf pictogram om op te nemen en actieve oproep te beëindigen"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigen bericht opstellen…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Luidspreker"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Verzenden"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Deze oproep weigeren met een bericht"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Beantwoorden als audiogesprek"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Inkomende oproep beantwoorden en actieve oproep beëindigen"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Opnemen en actieve oproep beëindigen"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Weigeren met bericht"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Beantwoorden als audiogesprek"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Inkomende oproep beantwoorden en actieve oproep beëindigen"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Opnemen en actieve oproep beëindigen"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is uit"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Veeg met twee vingers omhoog om te beantwoorden. Veeg met twee vingers omlaag om te weigeren."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Belangrijke oproep"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
index b9cae7da9..fb3538f04 100644
--- a/java/com/android/incallui/answer/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sveip fra ikonet for å svare med en lydsamtale"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Sveip oppover for å svare og sette samtalen som er i gang på vent"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Sveip fra ikonet for å svare på det innkommende anropet og avslutte samtalen som er i gang"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Høyttaler"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvis anropet med en melding"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svar med en lydsamtale"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvis med en melding"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svar med en lydsamtale"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Viktig samtale"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
index 8a95bcdbf..bc38c3f96 100644
--- a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ਔਡੀਓ ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦੇਣ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਰੋਕ ਕੇ ਰੱਖਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਰੋਕੀ ਗਈ ਕਾਲ ਸਮਾਪਤ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ਇਨਕਮਿੰਗ ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਕ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਕ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ਹੈਂਡਸੈੱਟ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ਸਪੀਕਰਫ਼ੋਨ"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ਭੇਜੋ"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਇਸ ਕਾਲ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ਔਡੀਓ ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ਇਨਕਮਿੰਗ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ਸੁਨੇਹੇ ਨਾਲ ਰੱਦ ਕਰੋ"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ਔਡੀਓ ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ਇਨਕਮਿੰਗ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ਵੀਡੀਓ ਬੰਦ ਹੈ"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ਮਹੱਤਵਪੂਰਨ ਕਾਲ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
index c7f2e4a22..8f3a7c873 100644
--- a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Przesuń palcem od ikony, aby odebrać jako połączenie głosowe"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Przesuń w górę, aby odebrać połączenie i wstrzymać trwającą rozmowę"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Przesuń w górę, aby odebrać połączenie i zakończyć wstrzymaną rozmowę"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Przesuń palcem od ikony, aby odebrać połączenie i zakończyć trwającą rozmowę"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Przesuń palcem od ikony, aby odebrać połączenie i zakończyć trwającą rozmowę"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napisz własną…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Słuchawka"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Głośnik"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Wyślij"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odrzuć to połączenie, wysyłając wiadomość"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Odbierz jako połączenie głosowe"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odrzuć, wysyłając wiadomość"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Odbierz jako połączenie głosowe"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Wideo jest wyłączone"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Przesuń dwoma palcami w górę, aby odebrać. Przesuń dwoma palcami w dół, aby odrzucić."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Ważne połączenie"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
index 8e4506bfc..1f3e1fa9e 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize a partir do ícone para atender como uma chamada de áudio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize para cima para atender uma chamada e colocar a outra em espera"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Deslize a partir do ícone para atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Aparelho"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Viva-voz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de áudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e encerrar a chamada em andamento"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de áudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Chamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
index d3bdb1317..1f4cbf8a9 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize rapidamente a partir do ícone para atender como uma chamada de voz"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize rapidamente para cima para atender e colocar em espera uma chamada em curso"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize rapidamente para cima para atender e terminar uma chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Deslize rapidamente a partir do ícone para atender uma chamada recebida e terminar uma chamada em curso"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslizar rapidamente a partir do ícone para atender e terminar uma chamada em curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva a sua própria…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Dispositivo"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altifalante"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de voz"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Atender chamada recebida e terminar chamada em curso"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e terminar uma chamada em curso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de voz"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Atender chamada recebida e terminar chamada em curso"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e terminar uma chamada em curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize rapidamente com dois dedos para cima para responder. Deslize rapidamente com dois dedos para baixo para recusar."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Chamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
index 8e4506bfc..1f3e1fa9e 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize a partir do ícone para atender como uma chamada de áudio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize para cima para atender uma chamada e colocar a outra em espera"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Deslize a partir do ícone para atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Aparelho"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Viva-voz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de áudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e encerrar a chamada em andamento"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de áudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Atender a chamada recebida e encerrar a chamada em andamento"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Chamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
index f2e3dcb6f..6d54f3c57 100644
--- a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Glisați de pe pictogramă pentru a răspunde ca apel audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Glisați în sus ca să răspundeți și să puneți apelul actual în așteptare."</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Glisați în sus ca să răspundeți și să încheiați apelul în așteptare."</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Glisați din pictogramă ca să răspundeți la apelul primit și să încheiați apelul în curs."</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Glisați din pictogramă ca să răspundeți și să încheiați apelul în curs"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrieți propriul răspuns…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Receptor"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Difuzor"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Trimiteți"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Respingeți apelul cu un mesaj"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Răspundeți ca apel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Răspundeți la apelul primit și încheiați apelul în curs"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Răspundeți și încheiați apelul în curs"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Respingeți cu un mesaj"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Răspundeți ca apel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Răspundeți la apelul primit și încheiați apelul în curs"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Răspundeți și încheiați apelul în curs"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Camera video este dezactivată."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Glisați cu două degete în sus pentru a răspunde și în jos pentru a respinge."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Apel important"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
index 6b9eba581..f2e6cfaf2 100644
--- a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Чтобы ответить в режиме голосового вызова, проведите пальцем от значка"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Чтобы ответить и поставить текущий вызов на удержание, проведите по экрану вверх"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Чтобы ответить и завершить вызов на удержании, проведите по экрану вверх"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Чтобы ответить на входящий вызов и завершить текущий, проведите пальцем от значка"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чтобы ответить и завершить текущий вызов, проведите пальцем от значка"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Ваш ответ…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Телефон"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Спикерфон"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Отправить"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Отклонить вызов и отправить SMS"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ответить в режиме голосового вызова"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Ответить на входящий вызов и завершить текущий"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Ответить и завершить текущий вызов"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Отклонить вызов и отправить SMS"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ответить в режиме голосового вызова"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Ответить на входящий вызов и завершить текущий"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ответить и завершить текущий вызов"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Камера выключена"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важный вызов"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
index bb7a13909..269fffabe 100644
--- a/java/com/android/incallui/answer/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දීමට නිරූපකයේ සිට ස්වයිප් කරන්න"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"කෙරෙමින් පවතින ඇමතුමට පිළිතුරු දීමට සහ රඳවා තබා ගැනීමට ඉහළට ස්වයිප් කරන්න"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"රඳවා තබා ගෙන සිටින ඇමතුමට පිළිතුරු දීමට සහ අවසන් කිරීමට ඉහළට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"එන ඇමතුමට පිළිතුරු දීමට සහ යන ඇමතුම අවසන් කිරීමට නිරූපකයෙන් ස්වයිප් කරන්න"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"යන ඇමතුමට පිළිතුරු දී අවසන් කිරීමට නිරූපකයෙන් ස්වයිප් කරන්න"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"ඔබෙම එක ලියන්න…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"හෑන්ඩ්සෙට්"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ස්පීකර්ෆෝන්"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"යවන්න"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"පණිවිඩයකින් මෙම ඇමතුම ප්‍රතික්ෂේප කරන්න"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"එන ඇමතුමට පිළිතුරු දෙන්න එමෙන්ම යන අැමතුම අවසන් කරන්න"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"යන අැමතුමට පිළිතරු දී අවසන් කරන්න"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"පණිවිඩයකින් ප්‍රතික්ෂේප කරන්න"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"එන ඇමතුමට පිළිතුරු දෙන්න එමෙන්ම යන ඇමතුම අවසන් කරන්න"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"යන අැමතුමට පිළිතරු දී අවසන් කරන්න"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"වීඩියෝව ක්‍රියාවිරහිතයි"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න, ප්‍රතික්ෂේප කිරීමට ඇඟිලි දෙකකින් පහළට ස්වයිප් කරන්න."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"වැදගත් ඇමතුම"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
index 3280117f7..ef6add1ba 100644
--- a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prejdením prstom od ikony prijať ako zvukový hovor"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prejdením prstom nahor prijmete hovor a podržíte prebiehajúci hovor"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prejdením prstom nahor prijmete hovor a ukončíte podržaný hovor"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Prejdením prstom od ikony prijmete prichádzajúci hovor a ukončíte prebiehajúci hovor"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prejdením prstom od ikony hovor prijmete a ukončíte prebiehajúci hovor"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napíšte vlastnú…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slúchadlo"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Reproduktor"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odoslať"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odmietnuť tento hovor so správou"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prijať ako zvukový hovor"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Prijať prichádzajúci hovor a ukončiť prebiehajúci hovor"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Prijať hovor a ukončiť prebiehajúci hovor"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odmietnuť so správou"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prijať ako zvukový hovor"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Prijať prichádzajúci hovor a ukončiť prebiehajúci hovor"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Prijať hovor a ukončiť prebiehajúci hovor"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ak chcete hovor prijať, prejdite dvomi prstami nahor. Ak ho chcete odmietnuť, prejdite dvomi prstami nadol."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Dôležitý hovor"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
index 67f31f393..819999aaf 100644
--- a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Povlecite z ikone, da klic sprejmete kot zvočni klic"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Povlecite navzgor, da sprejmete klic in zadržite aktivni klic"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Povlecite navzgor, da sprejmete klic in končate zadržani klic"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Povlecite z ikone, da sprejmete dohodni klic in končate aktivni klic"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Povlecite z ikone, da sprejmete klic in končate aktivni klic"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite lastno besedilo …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalka"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvočnik"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošlji"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Zavrnite ta klic s sporočilom"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sprejmite kot zvočni klic"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Sprejmi dohodni klic in končaj aktivni klic"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Sprejmi klic in končaj aktivni klic"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Zavrnitev s sporočilom"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sprejmite kot zvočni klic"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Sprejmi dohodni klic in končaj aktivni klic"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sprejmi klic in končaj aktivni klic"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je izklopljen"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Pomemben klic"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
index 14f8444db..f0c874ac1 100644
--- a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Rrëshqite nga ikona për t\'u përgjigjur si telefonatë me audio"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Rrëshqit shpejt lart për t\'u përgjigjur dhe për të vendosur në pritje telefonatën në vazhdim"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Rrëshqit shpejt lart për t\'u përgjigjur dhe për të mbyllur telefonatën në pritje"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Rrëshqit shpejt nga ikona për t\'iu përgjigjur telefonatës hyrëse dhe për të mbyllur telefonatën në vazhdim"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Rrëshqit shpejt nga ikona për t\'u përgjigjur dhe për të mbyllur telefonatën në vazhdim"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Shkruaj tënden…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Kufje"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altoparlanti"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Dërgo"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuzo këtë telefonatë me një mesazh"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Përgjigju si telefonatë me audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Përgjigjju telefonatës hyrëse dhe mbyll telefonatën në vazhdim"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Përgjigju dhe mbyll telefonatën në vazhdim"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuzo me mesazh"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Përgjigju si telefonatë me audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Përgjigjju telefonatës hyrëse dhe mbyll telefonatën në vazhdim"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Përgjigju dhe mbyll telefonatën në vazhdim"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoja është joaktive"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Rrëshqit dy gishta lart për t\'u përgjigjur. Rrëshqit dy gishta poshtë për të refuzuar."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Telefonatë e rëndësishme"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
index e1aace2c8..dc736102c 100644
--- a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Превуците од иконе да бисте одговорили аудио позивом"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Превуците нагоре да бисте одговорили и задржали позив који је у току"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Превуците нагоре да бисте одговорили и завршили позив који је на чекању"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Превуците од иконе да бисте одговорили на долазни позив и завршили позив који је у току"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Превуците од иконе да бисте се јавили и завршили позив који је у току"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишите сами…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Телефон"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Спикерфон"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Пошаљи"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Одбијте овај позив поруком"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Одговорите аудио позивом"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Одговорите на долазни позив и завршите позив који је у току"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Јавите се и завршите позив који је у току"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Одбијте поруком"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Одговорите аудио позивом"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Одговорите на долазни позив и завршите позив који је у току"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Јавите се и завршите позив који је у току"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Камера је искључена"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Превуците нагоре помоћу два прста да бисте одговорили. Превуците надоле помоћу два прста да бисте одбили."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важан позив"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
index 0093b8c82..cd96908dc 100644
--- a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Svep från ikonen för att svara som röstsamtal"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Svep uppåt för att svara och parkera pågående samtal"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Svep uppåt för att svara och avsluta parkerat samtal"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Svep från ikonen för att svara på inkommande samtal och avsluta pågående samtal"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Svep från ikonen för att svara och avsluta pågående samtal"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv eget …"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefonlur"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Högtalartelefon"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Skicka"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvisa det här samtalet med ett meddelande"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svara som röstsamtal"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Svara på inkommande samtal och avsluta pågående samtal"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svara och avsluta pågående samtal"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvisa med meddelande"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svara som röstsamtal"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Svara på inkommande samtal och avsluta pågående samtal"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara och avsluta pågående samtal"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video avstängd"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Dra två fingrar uppåt för att svara och två nedåt för att avvisa."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Viktigt samtal"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
index 025010d82..6ef801fc2 100644
--- a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Telezesha kidole ukianzia kwenye aikoni ili uijibu kama simu ya sauti"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Telezesha kidole ili upokee na usitishe kidogo simu inayoendelea"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Telezesha kidole ili upokee na ukate simu iliyositishwa"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Telezesha kidole ukianzia kwenye aikoni ili ujibu simu inayoingia na ukate simu inayoendelea"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Telezesha kidole ukianzia kwenye aikoni ili ujibu na ukate simu inayoendelea"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Andika yako mwenyewe…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Spika ya masikioni"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spika ya simu"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Tuma"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Kataa simu hii na utume ujumbe wa kueleza"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ijibu kama simu ya sauti"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Jibu simu inayoingia na ukate simu inayoendelea"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Jibu na ukate simu inayoendelea"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Kataa na utume ujumbe"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ijibu kama simu ya sauti"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Jibu simu inayoingia na ukate simu inayoendelea"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jibu na ukate simu inayoendelea"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video imezimwa"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Telezesha juu kwa vidole viwili ili uijibu. Telezesha chini kwa vidole viwili ili uikate."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Simu muhimu"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
index 5631afa54..273aa21fe 100644
--- a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ஆடியோ அழைப்பில் பதிலளிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை ஹோல்டில் வைக்க, மேலே ஸ்வைப் செய்யவும்"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, ஹோல்டில் உள்ள அழைப்பை முடிக்க, மேலே ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை முடிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"நீங்களே எழுதவும்…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ஹேண்ட்செட்"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ஸ்பீக்கர்ஃபோன்"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"அனுப்பு"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"செய்தி அனுப்பி இந்த அழைப்பை நிராகரி"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ஆடியோ அழைப்பில் பதிலளி"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை முடிக்கவும்"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடி"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"செய்தியுடன் நிராகரி"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ஆடியோ அழைப்பில் பதிலளி"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை முடிக்கவும்"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்கும்"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"வீடியோ முடக்கப்பட்டுள்ளது"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"பதிலளிக்க, இரு விரல்களால் மேலே ஸ்வைப் செய்யவும். நிராகரிக்க, இரு விரல்களால் கீழே ஸ்வைப் செய்யவும்."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"முக்கியமான அழைப்பு"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
index 932102cd0..2fba12102 100644
--- a/java/com/android/incallui/answer/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ఆడియో కాల్ రూపంలో సమాధానం ఇవ్వడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను హోల్డ్‌లో ఉంచడానికి పైకి స్వైప్ చేయండి"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"సమాధానం ఇవ్వడానికి మరియు హోల్డ్‌లో ఉన్న కాల్‌ను ముగించడానికి పైకి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ఇన్‌కమింగ్ కాల్‌కు సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను ముగించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను ముగించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"మీ స్వంతంగా వ్రాయండి…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"హ్యాండ్‌సెట్"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"స్పీకర్‌ఫోన్"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"పంపు"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ఈ కాల్‌ను సందేశంతో తిరస్కరించండి"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ఇన్‌కమింగ్ కాల్‌కు సమాధానం ఇవ్వండి మరియు కొనసాగుతున్న కాల్‌ను ముగించండి"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"సమాధానమివ్వండి మరియు కొనసాగుతున్న కాల్‌ను ముగించండి"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"సందేశంతో తిరస్కరించండి"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ఇన్‌కమింగ్ కాల్‌కు సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"వీడియో ఆఫ్‌లో ఉంది"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"సమాధానం ఇవ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి. తిరస్కరించడానికి రెండు వేళ్లతో క్రిందికి స్వైప్ చేయండి."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"ముఖ్యమైన కాల్"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
index 6df79594c..fb34af0ad 100644
--- a/java/com/android/incallui/answer/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"เลื่อนไอคอนเพื่อรับสายเป็นการโทรด้วยเสียง"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"เลื่อนขึ้นเพื่อรับและพักสายปัจจุบัน"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"เลื่อนจากไอคอนเพื่อรับสายเรียกเข้าและวางสายปัจจุบัน"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"เลื่อนจากไอคอนเพื่อรับและวางสาย"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"เขียนคำตอบของคุณเอง…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"มือถือ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"ลำโพง"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ส่ง"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ปฏิเสธสายเรียกเข้าด้วยข้อความ"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"รับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"รับสายเรียกเข้าและวางสายปัจจุบัน"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"รับและวางสาย"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ปฏิเสธด้วยข้อความ"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"รับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"รับสายเรียกเข้าและวางสายปัจจุบัน"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"รับและวางสาย"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"วิดีโอปิดอยู่"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ใช้สองนิ้วเลื่อนขึ้นเพื่อรับสายและเลื่อนลงเพื่อตัดสาย"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"สายสำคัญ"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
index fef9de94f..b0e2c370e 100644
--- a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"I-swipe mula sa icon upang sagutin bilang isang audio call"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"I-swipe nang pataas upang sagutin at i-hold ang kasalukuyang tawag"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"I-swipe nang pataas upang sagutin at tapusin ang tawag na naka-hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"I-swipe mula sa icon upang sagutin ang papasok na tawag at tapusin ang kasalukuyang tawag"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Mag-swipe mula sa icon upang sagutin at tapusin ang kasalukuyang tawag"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Magsulat ng sarili mo…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ipadala"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tanggihan ang tawag na ito gamit ang isang mensahe"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sagutin bilang audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Sagutin ang papasok na tawag at tapusin ang kasalukuyang tawag"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Sagutin at tapusin ang kasalukuyang tawag"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tanggihan gamit ang mensahe"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sagutin bilang audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Sagutin ang papasok na tawag at tapusin ang kasalukuyang tawag"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sagutin at tapusin ang kasalukuyang tawag"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Naka-off ang video"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"I-swipe nang pataas gamit ang dalawang daliri upang sagutin. I-swipe nang pababa gamit ang dalawang daliri upang tanggihan."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Mahalagang tawag"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
index 62bbba943..4dc02a75c 100644
--- a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sesli çağrı olarak cevaplamak için, simgeden hızlıca kaydırın"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Devam eden çağrı cevaplamak ve bekletmek için hızlıca yukarı kaydırın"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cevaplamak ve beklemedeki çağrıyı sona erdirmek için hızlıca yukarı kaydırın"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Gelen çağrıyı cevaplamak ve devam eden çağrıyı sona erdirmek için simgeden hızlıca kaydırın"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Bir çağrıyı cevaplamak ve devam eden çağrıyı sona erdirmek için simgeden hızlıca kaydırın"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kendi yanıtınızı oluşturun…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Mobil cihaz kulaklığı"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hoparlör"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gönder"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu çağrıyı mesajla reddedin"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sesli çağrı olarak cevaplayın"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Gelen çağrıyı cevapla ve devam eden çağrıyı sona erdir"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Bir çağrıyı cevaplayın ve devam eden çağrıyı sona erdirin"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Çağrıyı, mesajla reddedin"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sesli çağrı olarak cevaplayın"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Gelen çağrı cevaplanır ve devam eden çağrı sona erdirilir"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Bir çağrı cevaplanır ve devam eden çağrı sona erdirilir"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video kapalı"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cevaplamak için iki parmağınızla hızlıca yukarı kaydırın. Reddetmek içinse iki parmağınızla hızlıca aşağı kaydırın."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Önemli çağrı"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
index 1ef016cba..e077dbd11 100644
--- a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Проведіть пальцем убік від значка, щоб відповісти в режимі аудіодзвінка"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Проведіть пальцем угору, щоб відповісти, утримуючи поточний виклик"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Проведіть пальцем угору, щоб відповісти, завершивши утримуваний виклик"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Проведіть пальцем від значка, щоб відповісти на вхідний виклик, завершивши поточний"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Проведіть пальцем від значка, щоб відповісти на виклик, завершивши поточний"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишіть власну відповідь…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Гарнітура"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Гучний зв’язок"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Надіслати"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Відхилити цей виклик, додавши повідомлення"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Відповісти в режимі аудіодзвінка"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Відповісти на вхідний виклик, завершивши поточний"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Відповісти на виклик, завершивши поточний"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Відхилити, додавши повідомлення"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Відповісти в режимі аудіодзвінка"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Відповісти на вхідний виклик, завершивши поточний"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Відповісти на виклик, завершивши поточний"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Відео вимкнено"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити дзвінок."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Важливий виклик"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
index ea364499c..ec9ba4b25 100644
--- a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"آڈیو کال کے بطور جواب دینے کیلئے آئیکن سے سوائپ کریں"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"جواب دینے اور جاری کال کو ہولڈ کرنے کیلئے اوپر سوائپ کریں"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"جواب دینے اور ہولڈ کردہ کال کو ختم کرنے کیلئے اوپر سوائپ کریں"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"آنے والی کال کا جواب دینے اور جاری کال کو ختم کرنے کیلئے آئیکن سے سوائپ کریں"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"جواب دینے اور جاری کال ختم کرنے کیلے آئیکن سے سوائپ کریں"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"خود اپنا تحریر کریں…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ہینڈ سیٹ"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"اسپیکر فون"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"بھیجیں"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"اس کال کو ایک پیغام کے ساتھ مسترد کریں"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"آڈیو کال کے بطور جواب دیں"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"آنے والی کال کا جواب دیں اور جاری کال کو ختم کریں"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"جواب دیں اور جاری کال ختم کریں"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"پیغام کے ساتھ مسترد کریں"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"آڈیو کال کے بطور جواب دیں"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"آنے والی کال کا جواب دیں اور جاری کال کو ختم کریں"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"جواب دیں اور جاری کال ختم کریں"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ویڈیو آف ہے"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"جواب دینے کیلئے دوانگلیوں کے ساتھ اوپر سوائپ کریں۔ مسترد کرنے کیلئے دو انگلیوں کے ساتھ نیچے سوائپ کریں۔"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"اہم کال"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
index a018a68a1..f9a7927f8 100644
--- a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Ovozli qo‘ng‘iroq rejimida javob berish uchun nishonchadan suring."</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Javob berish va joriy qo‘ng‘iroqni kutish rejimiga o‘tkazish uchun tepaga suring"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Javob berish va kutish rejimidagi qo‘ng‘iroqni tugatish uchun tepaga suring"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish uchun nishonchadan suring"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish uchun nishonchadan suring"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Sizning javobingiz…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Baland ovoz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Yuborish"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu qo‘ng‘iroqni xabar bilan rad etish"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ovozli qo‘ng‘iroq rejimida javob berish"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Xabar yuborib rad etish"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ovozli qo‘ng‘iroq rejimida javob berish"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera o‘chiq"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Chaqiruvga javob berish uchun ikki barmoq bilan tepaga, rad etish uchun ikki barmoq bilan pastga suring."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Muhim chaqiruv"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
index 6d8a15046..187463472 100644
--- a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Vuốt từ biểu tượng để trả lời dưới dạng cuộc gọi âm thanh"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Vuốt lên để trả lời và giữ cuộc gọi đang diễn ra"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Vuốt lên để trả lời và kết thúc cuộc gọi đang chờ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Vuốt từ biểu tượng để trả lời cuộc gọi đến và kết thúc cuộc gọi đang diễn ra"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vuốt từ biểu tượng để trả lời và kết thúc cuộc gọi đang diễn ra"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Viết trả lời của riêng bạn…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Điện thoại di động"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Loa ngoài"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gửi"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Từ chối cuộc gọi này bằng tin nhắn"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Trả lời dưới dạng cuộc gọi âm thanh"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Trả lời cuộc gọi đến và kết thúc cuộc gọi đang diễn ra"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Trả lời và kết thúc cuộc gọi đang diễn ra"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Từ chối bằng tin nhắn"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Trả lời dưới dạng cuộc gọi âm thanh"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Trả lời cuộc gọi đến và kết thúc cuộc gọi đang diễn ra"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Trả lời và kết thúc cuộc gọi đang diễn ra"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video đã tắt"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vuốt hai ngón tay lên để trả lời. Vuốt hai ngón tay xuống để từ chối."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Cuộc gọi quan trọng"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
index d4228224d..c57620651 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"滑动图标即可以音频通话的形式接听"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑动即可接听并保持当前通话"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑动即可接听并结束保持的通话"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"滑动图标即可接听来电并结束当前通话"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑动图标即可接听并结束当前通话"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰写回复…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"手机听筒"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"免提"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"发送"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"拒接此来电并发送信息"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"以音频通话的形式接听"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"接听来电并结束当前通话"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接听并结束当前通话"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒接来电并发送信息"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"以音频通话的形式接听"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"接听来电并结束当前通话"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接听并结束当前通话"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"摄像头处于关闭状态"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"双指向上滑动即可接听，向下滑动则可拒接。"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"重要来电"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
index 00b0f5159..653466e4d 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"從圖示快速滑動即可接聽語音通話"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑動可接聽並保留進行中的通話"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽並結束保留的通話"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"從圖示快速滑動即可接聽來電並結束進行中的通話"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"從圖示快速滑動即可接聽及結束進行中的通話"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰寫回覆…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"免提聽筒"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"擴音器"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"發送"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"用訊息回絕此來電"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"接聽語音通話"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"接聽來電並結束進行中的通話"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接聽及結束進行中的通話"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"用訊息回絕"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"接聽語音通話"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"接聽來電並結束進行中的通話"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽及結束進行中的通話"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"視像已關閉"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"兩指向上滑動可接聽，向下滑動則可拒接。"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"重要來電"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
index 083494ad1..fe2c0d29a 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"滑動圖示即可透過語音通話方式接聽來電"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑動即可接聽及保留進行中的通話"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽及結束保留中的通話"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"滑動圖示即可接聽來電及結束進行中的通話"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑動圖示即可接聽來電及結束進行中的通話"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰寫回應…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"聽筒模式"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"擴音模式"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"傳送"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"拒接這通來電並傳送簡訊"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"透過語音通話方式接聽來電"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"接聽來電及結束進行中的通話"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接聽來電及結束進行中的通話"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒接來電並傳送簡訊"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"透過語音通話方式接聽來電"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"接聽來電及結束進行中的通話"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽來電及結束進行中的通話"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"已關閉攝影機"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"用雙指向上滑動可接聽，向下滑動可拒接。"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"重要通話"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
index f0c74da90..9c3a2d253 100644
--- a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swayipha kusuka esithonjaneni ukuze uphendule ikholi yomsindo"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swayiphela phezulu ukuze uphendule futhi ubambe ikholi eqhubekayo"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swayiphela phezulu ukuze uphendule futhi uphelise ikholi ebanjiwe"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Swayipha kusuka esithonjaneni ukuze uphendule ikholi engenayo futhi uphelise ikholi eqhubekayo"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swayipha kusukela kusithonjana ukuze uphendule uphinde uqede ikholi eqhubekayo"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Bhala okwakho…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Okuphathwa ngesandla"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Isipikhasefoni"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Thumela"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Yenqaba le kholi ngomlayezo"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Phendula njengekholi yomsindo"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Phendula ikholi engenayo bese uphelise ikholi eqhubekayo"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Phendula uphinde uqede ikholi eqhubekayo"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Yenqaba ngomsebenzi"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Phendula njengekholi yomsindo"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Phendula ikholi engenayo bese uphelise ikholi eqhubekayo"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Phendula uphinde uqede ikholi eqhubekayo"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Ividiyo ivaliwe"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swayiphela iminwe emibili phezulu ukuze uphendule. Swayiphela iminwe emibili phansi ukuze wenqabe."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Ikholi ebalulekile"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values/strings.xml b/java/com/android/incallui/answer/impl/res/values/strings.xml
index f13d8ecf5..94577adf7 100644
--- a/java/com/android/incallui/answer/impl/res/values/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values/strings.xml
@@ -4,7 +4,7 @@
   <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string>
   <string name="call_incoming_default_label_answer_and_release_second">Swipe up to answer and hold ongoing call</string>
   <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string>
-  <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer incoming call and end ongoing call</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string>
   <string name="call_incoming_message_custom">Write your own…</string>
   <string name="call_incoming_audio_handset">Handset</string>
   <string name="call_incoming_audio_speakerphone">Speakerphone</string>
@@ -16,10 +16,10 @@
   <string name="call_incoming_custom_message_send">Send</string>
   <string name="a11y_incoming_call_reject_with_sms">Reject this call with a message</string>
   <string name="a11y_incoming_call_answer_video_as_audio">Answer as audio call</string>
-  <string name="a11y_incoming_call_answer_and_release">Answer incoming call and end ongoing call</string>
+  <string name="a11y_incoming_call_answer_and_release">Answer and end ongoing call</string>
   <string name="a11y_description_incoming_call_reject_with_sms">Reject with message</string>
   <string name="a11y_description_incoming_call_answer_video_as_audio">Answer as audio call</string>
-  <string name="a11y_description_incoming_call_answer_and_release">Answer incoming call and end ongoing call</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Answer and end ongoing call</string>
   <!-- Text indicates the video local camera is off. [CHAR LIMIT=40] -->
   <string name="call_incoming_video_is_off">Video is off</string>
 
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index cc7e1e206..ab2feba3e 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -100,6 +100,11 @@ public class CallList implements DialerCallDelegate {
   @VisibleForTesting
   public CallList() {}
 
+  @VisibleForTesting
+  public static void setCallListInstance(CallList callList) {
+    sInstance = callList;
+  }
+
   /** Static singleton accessor method. */
   public static CallList getInstance() {
     return sInstance;
@@ -124,9 +129,11 @@ public class CallList implements DialerCallDelegate {
               new SpamBindings.Listener() {
                 @Override
                 public void onComplete(boolean isSpam) {
+                  boolean isIncomingCall =
+                      call.getState() == DialerCall.State.INCOMING
+                          || call.getState() == DialerCall.State.CALL_WAITING;
                   if (isSpam) {
-                    if (call.getState() != DialerCall.State.INCOMING
-                        && call.getState() != DialerCall.State.CALL_WAITING) {
+                    if (!isIncomingCall) {
                       LogUtil.i(
                           "CallList.onCallAdded",
                           "marking spam call as not spam because it's not an incoming call");
@@ -140,13 +147,15 @@ public class CallList implements DialerCallDelegate {
                     }
                   }
 
-                  Logger.get(context)
-                      .logCallImpression(
-                          isSpam
-                              ? DialerImpression.Type.INCOMING_SPAM_CALL
-                              : DialerImpression.Type.INCOMING_NON_SPAM_CALL,
-                          call.getUniqueCallId(),
-                          call.getTimeAddedMs());
+                  if (isIncomingCall) {
+                    Logger.get(context)
+                        .logCallImpression(
+                            isSpam
+                                ? DialerImpression.Type.INCOMING_SPAM_CALL
+                                : DialerImpression.Type.INCOMING_NON_SPAM_CALL,
+                            call.getUniqueCallId(),
+                            call.getTimeAddedMs());
+                  }
                   call.setSpam(isSpam);
                   dialerCallListener.onDialerCallUpdate();
                 }
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 4f5a8b7ec..f37ce27a7 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -49,6 +49,7 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.nano.ContactLookupResult;
 import com.android.incallui.latencyreport.LatencyReport;
 import com.android.incallui.util.TelecomCallUtil;
@@ -56,6 +57,7 @@ import com.android.incallui.videotech.VideoTech;
 import com.android.incallui.videotech.VideoTech.VideoTechListener;
 import com.android.incallui.videotech.empty.EmptyVideoTech;
 import com.android.incallui.videotech.ims.ImsVideoTech;
+import com.android.incallui.videotech.lightbringer.LightbringerTech;
 import com.android.incallui.videotech.utils.VideoUtils;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -1252,12 +1254,16 @@ public class DialerCall implements VideoTechListener {
   }
 
   private static class VideoTechManager {
+    private final Context context;
     private final EmptyVideoTech emptyVideoTech = new EmptyVideoTech();
     private final List<VideoTech> videoTechs;
     private VideoTech savedTech;
 
     VideoTechManager(DialerCall call) {
+      this.context = call.mContext;
+
       String phoneNumber = call.getNumber();
+      phoneNumber = phoneNumber != null ? phoneNumber : "";
 
       // Insert order here determines the priority of that video tech option
       this.videoTechs = new ArrayList<>();
@@ -1269,10 +1275,14 @@ public class DialerCall implements VideoTechListener {
               .newRcsVideoShare(
                   EnrichedCallComponent.get(call.mContext).getEnrichedCallManager(),
                   call,
-                  phoneNumber != null ? phoneNumber : "");
+                  phoneNumber);
       if (rcsVideoTech != null) {
         videoTechs.add(rcsVideoTech);
       }
+
+      videoTechs.add(
+          new LightbringerTech(
+              LightbringerComponent.get(call.mContext).getLightbringer(), call, phoneNumber));
     }
 
     VideoTech getVideoTech() {
@@ -1281,7 +1291,7 @@ public class DialerCall implements VideoTechListener {
       }
 
       for (VideoTech tech : videoTechs) {
-        if (tech.isAvailable()) {
+        if (tech.isAvailable(context)) {
           // Remember the first VideoTech that becomes available and always use it
           savedTech = tech;
           return savedTech;
@@ -1293,7 +1303,7 @@ public class DialerCall implements VideoTechListener {
 
     void dispatchCallStateChanged(int newState) {
       for (VideoTech videoTech : videoTechs) {
-        videoTech.onCallStateChanged(newState);
+        videoTech.onCallStateChanged(context, newState);
       }
     }
   }
diff --git a/java/com/android/incallui/calllocation/impl/LocationFragment.java b/java/com/android/incallui/calllocation/impl/LocationFragment.java
index b152cd683..3c5d2f972 100644
--- a/java/com/android/incallui/calllocation/impl/LocationFragment.java
+++ b/java/com/android/incallui/calllocation/impl/LocationFragment.java
@@ -30,6 +30,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.nano.DialerImpression;
 import com.android.incallui.baseui.BaseFragment;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -114,6 +116,7 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr
     locationMap.setVisibility(View.VISIBLE);
     locationMap.setImageDrawable(mapImage);
     displayWhenReady();
+    Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_GOT_MAP);
   }
 
   @Override
@@ -139,6 +142,8 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr
         updateText(addressLine1, address);
         updateText(addressLine2, null);
       }
+
+      Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_GOT_ADDRESS);
     }
     displayWhenReady();
   }
@@ -155,6 +160,8 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr
           getContext()
               .getString(
                   R.string.lat_long_format, location.getLatitude(), location.getLongitude()));
+
+      Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_GOT_LOCATION);
     }
     displayWhenReady();
   }
@@ -186,6 +193,8 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr
       startActivity(
           LocationUrlBuilder.getShowMapIntent(
               location, addressLine1.getText(), addressLine2.getText()));
+
+      Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_LAUNCHED_MAP);
     }
   }
 
diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java
index 645e9b86a..3a1478945 100644
--- a/java/com/android/incallui/calllocation/impl/LocationHelper.java
+++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java
@@ -22,6 +22,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.IntDef;
 import android.support.annotation.MainThread;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
@@ -35,6 +36,8 @@ import com.google.android.gms.common.api.Status;
 import com.google.android.gms.location.LocationListener;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,6 +48,23 @@ public class LocationHelper {
   private static final int LAST_UPDATE_THRESHOLD_MS = 60 * 1000;
   private static final int LOCATION_ACCURACY_THRESHOLD_METERS = 100;
 
+  public static final int LOCATION_STATUS_UNKNOWN = 0;
+  public static final int LOCATION_STATUS_OK = 1;
+  public static final int LOCATION_STATUS_STALE = 2;
+  public static final int LOCATION_STATUS_INACCURATE = 3;
+  public static final int LOCATION_STATUS_NO_LOCATION = 4;
+
+  /** Possible return values for {@code checkLocation()} */
+  @IntDef({
+    LOCATION_STATUS_UNKNOWN,
+    LOCATION_STATUS_OK,
+    LOCATION_STATUS_STALE,
+    LOCATION_STATUS_INACCURATE,
+    LOCATION_STATUS_NO_LOCATION
+  })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface LocationStatus {}
+
   private final LocationHelperInternal locationHelperInternal;
   private final List<LocationListener> listeners = new ArrayList<>();
 
@@ -71,28 +91,32 @@ public class LocationHelper {
   }
 
   /**
-   * Whether the location is valid. We consider it valid if it was recorded within the specified
-   * time threshold of the present and has an accuracy less than the specified distance threshold.
+   * Check whether the location is valid. We consider it valid if it was recorded within the
+   * specified time threshold of the present and has an accuracy less than the specified distance
+   * threshold.
    *
    * @param location The location to determine the validity of.
-   * @return {@code true} if the location is valid, and {@code false} otherwise.
+   * @return {@code LocationStatus} indicating if the location is valid or the reason its not valid
    */
-  static boolean isValidLocation(Location location) {
-    if (location != null) {
-      long locationTimeMs = location.getTime();
-      long elapsedTimeMs = System.currentTimeMillis() - locationTimeMs;
-      if (elapsedTimeMs > LAST_UPDATE_THRESHOLD_MS) {
-        LogUtil.i("LocationHelper.isValidLocation", "stale location, age: " + elapsedTimeMs);
-        return false;
-      }
-      if (location.getAccuracy() > LOCATION_ACCURACY_THRESHOLD_METERS) {
-        LogUtil.i("LocationHelper.isValidLocation", "poor accuracy: " + location.getAccuracy());
-        return false;
-      }
-      return true;
+  static @LocationStatus int checkLocation(Location location) {
+    if (location == null) {
+      LogUtil.i("LocationHelper.checkLocation", "no location");
+      return LOCATION_STATUS_NO_LOCATION;
     }
-    LogUtil.i("LocationHelper.isValidLocation", "no location");
-    return false;
+
+    long locationTimeMs = location.getTime();
+    long elapsedTimeMs = System.currentTimeMillis() - locationTimeMs;
+    if (elapsedTimeMs > LAST_UPDATE_THRESHOLD_MS) {
+      LogUtil.i("LocationHelper.checkLocation", "stale location, age: " + elapsedTimeMs);
+      return LOCATION_STATUS_STALE;
+    }
+
+    if (location.getAccuracy() > LOCATION_ACCURACY_THRESHOLD_METERS) {
+      LogUtil.i("LocationHelper.checkLocation", "poor accuracy: " + location.getAccuracy());
+      return LOCATION_STATUS_INACCURATE;
+    }
+
+    return LOCATION_STATUS_OK;
   }
 
   @MainThread
diff --git a/java/com/android/incallui/calllocation/impl/LocationPresenter.java b/java/com/android/incallui/calllocation/impl/LocationPresenter.java
index a56fd3b3c..155d9fdfd 100644
--- a/java/com/android/incallui/calllocation/impl/LocationPresenter.java
+++ b/java/com/android/incallui/calllocation/impl/LocationPresenter.java
@@ -21,6 +21,8 @@ import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.nano.DialerImpression;
 import com.android.incallui.baseui.Presenter;
 import com.android.incallui.baseui.Ui;
 import com.google.android.gms.location.LocationListener;
@@ -71,8 +73,9 @@ public class LocationPresenter extends Presenter<LocationPresenter.LocationUi>
     LogUtil.i("LocationPresenter.updateLocation", "location: " + location);
     if (forceUpdate || !Objects.equals(mLastLocation, location)) {
       mLastLocation = location;
-      if (LocationHelper.isValidLocation(location)) {
-        LocationUi ui = getUi();
+      int status = LocationHelper.checkLocation(location);
+      LocationUi ui = getUi();
+      if (status == LocationHelper.LOCATION_STATUS_OK) {
         mDownloadMapTask = new DownloadMapImageTask(new WeakReference<>(ui)).execute(location);
         mReverseGeocodeTask = new ReverseGeocodeTask(new WeakReference<>(ui)).execute(location);
         if (ui != null) {
@@ -80,6 +83,17 @@ public class LocationPresenter extends Presenter<LocationPresenter.LocationUi>
         } else {
           LogUtil.i("LocationPresenter.updateLocation", "no Ui");
         }
+      } else if (status != LocationHelper.LOCATION_STATUS_NO_LOCATION) {
+        // Log impression indicating why the location is not valid
+        // Note: its possible for this to be called before the UI has been initialized.
+        Context context = (ui != null) ? ui.getContext() : null;
+        if (context != null) {
+          if (status == LocationHelper.LOCATION_STATUS_STALE) {
+            Logger.get(context).logImpression(DialerImpression.Type.EMERGENCY_STALE_LOCATION);
+          } else if (status == LocationHelper.LOCATION_STATUS_INACCURATE) {
+            Logger.get(context).logImpression(DialerImpression.Type.EMERGENCY_INACCURATE_LOCATION);
+          }
+        }
       }
     }
   }
diff --git a/java/com/android/incallui/commontheme/res/anim/blinking.xml b/java/com/android/incallui/commontheme/res/anim/blinking.xml
index aaec18c56..4b921c611 100644
--- a/java/com/android/incallui/commontheme/res/anim/blinking.xml
+++ b/java/com/android/incallui/commontheme/res/anim/blinking.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
   <alpha
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromAlpha="0.0"
+    android:duration="800"
+    android:fromAlpha="0.26"
     android:interpolator="@android:anim/linear_interpolator"
     android:repeatCount="infinite"
     android:repeatMode="reverse"
-    android:toAlpha="1.0"/>
+    android:toAlpha="0.6"/>
 </set>
\ No newline at end of file
diff --git a/java/com/android/incallui/commontheme/res/values/styles.xml b/java/com/android/incallui/commontheme/res/values/styles.xml
index 311f9cf4b..81e64cb16 100644
--- a/java/com/android/incallui/commontheme/res/values/styles.xml
+++ b/java/com/android/incallui/commontheme/res/values/styles.xml
@@ -33,6 +33,15 @@
     <item name="android:textSize">18sp</item>
   </style>
 
+  <style name="BottomRowIcon">
+    <item name="android:layout_height">24dp</item>
+    <item name="android:layout_width">24dp</item>
+    <item name="android:layout_marginEnd">8dp</item>
+    <item name="android:scaleType">fitCenter</item>
+    <item name="android:tint">?android:textColorSecondary</item>
+    <item name="android:tintMode">src_in</item>
+  </style>
+
   <style name="Incall.Button.End" parent="android:Widget.Material.Button">
     <item name="android:background">@drawable/incall_end_call_background</item>
     <item name="android:elevation">8dp</item>
diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java
index 6ddce4533..228c786a0 100644
--- a/java/com/android/incallui/contactgrid/BottomRow.java
+++ b/java/com/android/incallui/contactgrid/BottomRow.java
@@ -45,7 +45,7 @@ public class BottomRow {
     @Nullable public final CharSequence label;
     public final boolean isTimerVisible;
     public final boolean isWorkIconVisible;
-    public final boolean isHdAttemptinIconVisible;
+    public final boolean isHdAttemptingIconVisible;
     public final boolean isHdIconVisible;
     public final boolean isForwardIconVisible;
     public final boolean isSpamIconVisible;
@@ -55,7 +55,7 @@ public class BottomRow {
         @Nullable CharSequence label,
         boolean isTimerVisible,
         boolean isWorkIconVisible,
-        boolean isHdAttemptinIconVisible,
+        boolean isHdAttemptingIconVisible,
         boolean isHdIconVisible,
         boolean isForwardIconVisible,
         boolean isSpamIconVisible,
@@ -63,7 +63,7 @@ public class BottomRow {
       this.label = label;
       this.isTimerVisible = isTimerVisible;
       this.isWorkIconVisible = isWorkIconVisible;
-      this.isHdAttemptinIconVisible = isHdAttemptinIconVisible;
+      this.isHdAttemptingIconVisible = isHdAttemptingIconVisible;
       this.isHdIconVisible = isHdIconVisible;
       this.isForwardIconVisible = isForwardIconVisible;
       this.isSpamIconVisible = isSpamIconVisible;
@@ -122,7 +122,7 @@ public class BottomRow {
   }
 
   private static CharSequence getLabelForPhoneNumber(PrimaryInfo primaryInfo) {
-    if (primaryInfo.nameIsNumber) {
+    if (primaryInfo.location != null) {
       return primaryInfo.location;
     }
     if (!TextUtils.isEmpty(primaryInfo.number)) {
diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index a0b687c2d..ddbceb052 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -320,14 +320,15 @@ public class ContactGridManager {
     bottomTextView.setAllCaps(info.isSpamIconVisible);
     workIconImageView.setVisibility(info.isWorkIconVisible ? View.VISIBLE : View.GONE);
     boolean wasHdIconVisible = hdIconImageView.getVisibility() == View.VISIBLE;
-    if (!wasHdIconVisible && info.isHdAttemptinIconVisible) {
+    hdIconImageView.setVisibility(
+        info.isHdIconVisible || info.isHdAttemptingIconVisible ? View.VISIBLE : View.GONE);
+    if (!wasHdIconVisible && info.isHdAttemptingIconVisible) {
       Animation animation = AnimationUtils.loadAnimation(context, R.anim.blinking);
       hdIconImageView.startAnimation(animation);
-    } else if (wasHdIconVisible && !info.isHdAttemptinIconVisible) {
+    } else if (wasHdIconVisible && !info.isHdAttemptingIconVisible) {
       hdIconImageView.clearAnimation();
+      hdIconImageView.setAlpha(1f);
     }
-    hdIconImageView.setVisibility(
-        info.isHdIconVisible || info.isHdAttemptinIconVisible ? View.VISIBLE : View.GONE);
     forwardIconImageView.setVisibility(info.isForwardIconVisible ? View.VISIBLE : View.GONE);
     spamIconImageView.setVisibility(info.isSpamIconVisible ? View.VISIBLE : View.GONE);
 
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
index b7a3fe7d4..b6028ed9c 100644
--- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
@@ -9,41 +9,21 @@
   tools:showIn="@layout/incall_contact_grid">
   <ImageView
     android:id="@id/contactgrid_workIcon"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:scaleType="fitCenter"
     android:src="@drawable/ic_work_profile"
-    android:tint="#ffffff"
-    tools:visibility="gone"
-    />
+    style="@style/BottomRowIcon"/>
   <ImageView
     android:id="@id/contactgrid_hdIcon"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:scaleType="fitCenter"
     android:src="@drawable/quantum_ic_hd_white_24"
-    tools:visibility="gone"
-    />
+    style="@style/BottomRowIcon"
+    android:visibility="gone"/>
   <ImageView
     android:id="@id/contactgrid_forwardIcon"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:scaleType="fitCenter"
     android:src="@drawable/quantum_ic_forward_white_24"
-    tools:visibility="gone"
-    />
+    style="@style/BottomRowIcon"/>
   <ImageView
     android:id="@+id/contactgrid_spamIcon"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_marginEnd="8dp"
-    android:scaleType="fitCenter"
     android:src="@drawable/quantum_ic_report_white_18"
-    tools:visibility="gone"
-    />
+    style="@style/BottomRowIcon"/>
   <ViewAnimator
     android:id="@+id/contactgrid_bottom_text_switcher"
     android:layout_width="wrap_content"
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index ea3ce8efb..b02237dcf 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -202,6 +202,12 @@ public class InCallFragment extends Fragment
   }
 
   @Override
+  public void onPause() {
+    super.onPause();
+    inCallScreenDelegate.onInCallScreenPaused();
+  }
+
+  @Override
   public void onDestroy() {
     super.onDestroy();
     inCallScreenDelegate.onInCallScreenUnready();
@@ -438,8 +444,10 @@ public class InCallFragment extends Fragment
       pager.setSwipingLocked(false);
     } else {
       paginator.setVisibility(View.GONE);
-      pager.setSwipingLocked(true);
-      pager.setCurrentItem(adapter.getButtonGridPosition());
+      if (adapter != null) {
+        pager.setSwipingLocked(true);
+        pager.setCurrentItem(adapter.getButtonGridPosition());
+      }
     }
   }
 
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
@@ -5,7 +5,7 @@
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
     <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
@@ -5,7 +5,7 @@
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
     <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
@@ -5,7 +5,7 @@
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
     <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
diff --git a/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java b/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
index b39f9f4a2..98c3e0f31 100644
--- a/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
+++ b/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
@@ -39,5 +39,7 @@ public interface InCallScreenDelegate {
 
   void onInCallScreenResumed();
 
+  void onInCallScreenPaused();
+
   Drawable getDefaultContactPhotoDrawable();
 }
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 1e9294c12..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index 757d339c4..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_call_split_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_call_split_white_24dp.png
deleted file mode 100644
index 4e3dbf55d..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_call_split_white_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 9ab350e9a..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 7c281c3f5..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_01.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_01.png
deleted file mode 100644
index e4ff6db13..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_01.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_02.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_02.png
deleted file mode 100644
index bc2b3d2f8..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_02.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_03.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_03.png
deleted file mode 100644
index fa936cbdc..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_03.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_04.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_04.png
deleted file mode 100644
index ef5137976..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_04.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_05.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_05.png
deleted file mode 100644
index 3712d164d..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_05.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_06.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_06.png
deleted file mode 100644
index c6a4216a3..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_06.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_07.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_07.png
deleted file mode 100644
index e4ff6db13..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_07.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_08.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_08.png
deleted file mode 100644
index e4ff6db13..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_08.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_09.png b/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_09.png
deleted file mode 100644
index e4ff6db13..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_ongoing_phone_24px_09.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index 185d03393..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png
deleted file mode 100644
index a2177f58a..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png
deleted file mode 100644
index bd9489c85..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index f3581d104..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_business.png b/java/com/android/incallui/res/drawable-hdpi/img_business.png
deleted file mode 100644
index f70634262..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_business.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_conference.png b/java/com/android/incallui/res/drawable-hdpi/img_conference.png
deleted file mode 100644
index 3d9f683a5..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_conference.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_no_image.png b/java/com/android/incallui/res/drawable-hdpi/img_no_image.png
deleted file mode 100644
index fd0ab3211..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_no_image.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_phone.png b/java/com/android/incallui/res/drawable-hdpi/img_phone.png
deleted file mode 100644
index 748312e6e..000000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_phone.png
+++ /dev/null
diff --git a/java/com/android/incallui/res/drawable/spam_notification_icon.xml b/java/com/android/incallui/res/drawable/spam_notification_icon.xml
index 266897838..a26e7d479 100644
--- a/java/com/android/incallui/res/drawable/spam_notification_icon.xml
+++ b/java/com/android/incallui/res/drawable/spam_notification_icon.xml
@@ -28,7 +28,7 @@
   </item>
 
   <item
-    android:drawable="@drawable/ic_report_white_36dp"
+    android:drawable="@drawable/quantum_ic_report_white_36"
     android:gravity="center"/>
 
 </layer-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values-af/strings.xml b/java/com/android/incallui/res/values-af/strings.xml
index 0ae4a4d9d..a46963fad 100644
--- a/java/com/android/incallui/res/values-af/strings.xml
+++ b/java/com/android/incallui/res/values-af/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Voortdurende Wi-Fi-werkoproep"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkomende oproep met boodskap"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkomende oproep met ligging"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkomende oproep met foto en boodskap"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkomende oproep met foto en ligging"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkomende oproep met boodskap en ligging"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkomende oproep met foto, boodskap en ligging"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkomende oproep met aanhegsels"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Belangrike inkomende oproep"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Belangrike inkomende oproep met foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Belangrike inkomende oproep met boodskap"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Belangrike inkomende oproep met ligging"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Belangrike inkomende oproep met foto en boodskap"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Belangrike inkomende oproep met foto en ligging"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Belangrike inkomende oproep met boodskap en ligging"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrike inkomende oproep met foto, boodskap en ligging"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrike inkomende oproep met aanhegsels"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende werkoproep"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende Wi-Fi-oproep"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende Wi-Fi-werkoproep"</string>
diff --git a/java/com/android/incallui/res/values-am/strings.xml b/java/com/android/incallui/res/values-am/strings.xml
index 4cbb2344c..4bbbe3a9e 100644
--- a/java/com/android/incallui/res/values-am/strings.xml
+++ b/java/com/android/incallui/res/values-am/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"በሂደት ላይ ያለ የWi-Fi የሥራ ጥሪ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ያዝናቆይ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ገቢ ጥሪ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ገቢ ጥሪ ከፎቶ ጋር"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ገቢ ጥሪ ከመልዕክት ጋር"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ገቢ ጥሪ ከአካባቢ ጋር"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ገቢ ጥሪ ከአባሪዎች ጋር"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"አስፈላጊ ገቢ ጥሪ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"አስፈላጊ ገቢ ጥሪ ከፎቶ ጋር"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"አስፈላጊ ገቢ ጥሪ ከመልዕክት ጋር"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"አስፈላጊ ገቢ ጥሪ ከአካባቢ ጋር"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"አስፈላጊ ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ገቢ የሥራ ጥሪ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ገቢ የWi-Fi ጥሪ"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ገቢ የWi-Fi የሥራ ጥሪ"</string>
diff --git a/java/com/android/incallui/res/values-ar/strings.xml b/java/com/android/incallui/res/values-ar/strings.xml
index 2a95265ec..d6bdaf5f8 100644
--- a/java/com/android/incallui/res/values-ar/strings.xml
+++ b/java/com/android/incallui/res/values-ar/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏مكالمة عمل جارية عبر اتصال Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"معلقة"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"مكالمة واردة"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"مكالمة واردة مع صورة"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"مكالمة واردة مع رسالة"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"مكالمة واردة مع موقع"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"مكالمة واردة مع صورة ورسالة"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"مكالمة واردة مع صورة وموقع"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"مكالمة واردة مع رسالة وموقع"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"مكالمة واردة مع صورة ورسالة وموقع"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"مكالمة واردة مع مرفقات"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"مكالمة واردة مهمة"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"مكالمة واردة مهمة مع صورة"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"مكالمة واردة مهمة مع رسالة"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"مكالمة واردة مهمة مع موقع"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"مكالمة واردة مهمة مع صورة ورسالة"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"مكالمة واردة مهمة مع صورة وموقع"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"مكالمة واردة مهمة مع رسالة وموقع"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"مكالمة واردة مهمة مع صورة ورسالة وموقع"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"مكالمة واردة مهمة مع مرفقات"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"مكالمة عمل واردة"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏اتصال وارد عبر Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏مكالمة عمل واردة عبر اتصال Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-az/strings.xml b/java/com/android/incallui/res/values-az/strings.xml
index 0dabebdcf..0f03d1d93 100644
--- a/java/com/android/incallui/res/values-az/strings.xml
+++ b/java/com/android/incallui/res/values-az/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Davam edən Wi-Fi iş çağrısı"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gözləmə mövqeyində"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gələn zəng"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Foto ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Mesaj ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Məkan ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Foto və mesaj ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Foto və məkan ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Mesaj və məkan ilə gələn zəng"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Foto, mesaj və məkan ilə gələn zəng"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Qoşma ilə gələn zəng"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Vacib gələn zəng"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Foto ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mesaj ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Məkan ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Foto və mesaj ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Foto və məkan ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mesaj və məkan ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Foto, mesaj və məkan ilə gələn vacib zəng"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Qoşma ilə gələn vacib zəng"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Daxil olan iş çağrısı"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gələn Wi-Fi zəngi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Daxil olan Wi-Fi iş çağrısı"</string>
diff --git a/java/com/android/incallui/res/values-be/strings.xml b/java/com/android/incallui/res/values-be/strings.xml
index 21b6f583e..6509bde94 100644
--- a/java/com/android/incallui/res/values-be/strings.xml
+++ b/java/com/android/incallui/res/values-be/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Бягучы выклік па працы праз Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"У чаканні"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Уваходны выклік"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Уваходны выклік з фота"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Уваходны выклік з паведамленнем"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Уваходны выклік з месцам"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Уваходны выклік з фота і паведамленнем"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Уваходны выклік з фота і месцам"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Уваходны выклік з паведамленнем і месцам"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Уваходны выклік з фота, паведамленнем і месцам"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Уваходны выклік з далучэннямі"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важны ўваходны выклік"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важны ўваходны выклік з фота"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важны ўваходны выклік з паведамленнем"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важны ўваходны выклік з месцам"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важны ўваходны выклік з фота і паведамленнем"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важны ўваходны выклік з фота і месцам"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важны ўваходны выклік з паведамленнем і месцам"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важны выклік з фота, паведамленнем і месцам"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важны ўваходны выклік з далучэннямі"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Уваходны выклік па працы"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Уваходны выклік праз Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Уваходны выклік па працы праз Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-bg/strings.xml b/java/com/android/incallui/res/values-bg/strings.xml
index 466cfb3b1..1f37ac6b2 100644
--- a/java/com/android/incallui/res/values-bg/strings.xml
+++ b/java/com/android/incallui/res/values-bg/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущо служебно обаждане през Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вх. обаждане"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящо обаждане със снимка"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Входящо обаждане със съобщение"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Входящо обаждане с местоположение"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Входящо обаждане със снимка и съобщение"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Входящо обаждане със снимка и местоположение"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Входящо обаждане със съобщение и местоположение"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Обаждане със снимка, съобщение и местоположение"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Входящо обаждане с прикачени файлове"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важно входящо обаждане"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важно входящо обаждане със снимка"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важно входящо обаждане със съобщение"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важно входящо обаждане с местоположение"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важно входящо обаждане със снимка и съобщение"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важно входящо обаждане със снимка и местоположение"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важно обаждане със съобщение и местоположение"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важно обаждане с местоположение, снимка, съобщение"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важно входящо обаждане с прикачени файлове"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящо служебно обаждане"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящо обаждане през Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящо служебно обаждане през Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-bn/strings.xml b/java/com/android/incallui/res/values-bn/strings.xml
index dfb17c952..638236767 100644
--- a/java/com/android/incallui/res/values-bn/strings.xml
+++ b/java/com/android/incallui/res/values-bn/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"চলমান ওয়াই-ফাই কাজের কল"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ফটো সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"বার্তা সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"অবস্থান সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ফটো এবং বার্তা সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ফটো এবং অবস্থান সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"বার্তা এবং অবস্থান সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ফটো, বার্তা এবং অবস্থান সহ ইনকামিং কল"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"সংযুক্তিগুলি সহ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ফটো সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ফটো এবং বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ফটো এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ফটো, বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"সংযুক্তিগুলি সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"আগত কাজের কল"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"আগত ওয়াই-ফাই কল"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"আগত ওয়াই-ফাই কাজের কল"</string>
diff --git a/java/com/android/incallui/res/values-bs/strings.xml b/java/com/android/incallui/res/values-bs/strings.xml
index 91ecee61e..4f4bfc706 100644
--- a/java/com/android/incallui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/res/values-bs/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi poslovni poziv u toku"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dolazni poziv s porukom"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dolazni poziv s lokacijom"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dolazni poziv s fotografijom i porukom"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dolazni poziv s fotografijom i lokacijom"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dolazni poziv s porukom i lokacijom"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dolazni poziv s fotografijom, porukom i lokacijom"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dolazni poziv s prilozima"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Važan dolazni poziv"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Važan dolazni poziv s fotografijom"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Važan dolazni poziv s porukom"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Važan dolazni poziv s lokacijom"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Važan dolazni poziv s fotografijom i porukom"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Važan dolazni poziv s fotografijom i lokacijom"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Važan dolazni poziv s porukom i lokacijom"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni Wi-Fi poslovni poziv"</string>
diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml
index 8047d4a54..102e2fee4 100644
--- a/java/com/android/incallui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/res/values-ca/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trucada de feina per Wi-Fi en curs"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Trucada entrant"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Trucada entrant amb foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Trucada entrant amb missatge"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Trucada entrant amb ubicació"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Trucada entrant amb foto i missatge"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Trucada entrant amb foto i ubicació"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Trucada entrant amb missatge i ubicació"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Trucada entrant amb foto, missatge i ubicació"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Trucada entrant amb fitxers adjunts"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Trucada entrant important"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Trucada entrant important amb foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Trucada entrant important amb missatge"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Trucada entrant important amb ubicació"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Trucada entrant important amb foto i missatge"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Trucada entrant important amb foto i ubicació"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Trucada entrant important amb missatge i ubicació"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Trucada entrant important amb foto, missatge i ubicació"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Trucada entrant important amb fitxers adjunts"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Trucada de feina entrant"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Trucada Wi-Fi entrant"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Trucada de feina per Wi-Fi entrant"</string>
diff --git a/java/com/android/incallui/res/values-cs/strings.xml b/java/com/android/incallui/res/values-cs/strings.xml
index f1a707f23..2ec55e2e1 100644
--- a/java/com/android/incallui/res/values-cs/strings.xml
+++ b/java/com/android/incallui/res/values-cs/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Probíhající pracovní hovor (Wi-Fi)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Příchozí hovor"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Příchozí hovor s fotkou"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Příchozí hovor se zprávou"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Příchozí hovor s polohou"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Příchozí hovor s fotkou a zprávou"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Příchozí hovor s fotkou a polohou"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Příchozí hovor se zprávou a polohou"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Příchozí hovor s fotkou, zprávou a polohou"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Příchozí hovor s přílohami"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Důležitý příchozí hovor"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Důležitý příchozí hovor s fotkou"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Důležitý příchozí hovor se zprávou"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Důležitý příchozí hovor s polohou"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Důležitý příchozí hovor s fotkou a zprávou"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Důležitý příchozí hovor s fotkou a polohou"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Důležitý příchozí hovor se zprávou a polohou"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Důležitý přích. hovor s fotkou, zprávou a polohou"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Důležitý příchozí hovor s přílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Příchozí pracovní hovor"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Příchozí volání přes Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Příchozí pracovní hovor (Wi-Fi)"</string>
diff --git a/java/com/android/incallui/res/values-da/strings.xml b/java/com/android/incallui/res/values-da/strings.xml
index 7f663f592..07450353c 100644
--- a/java/com/android/incallui/res/values-da/strings.xml
+++ b/java/com/android/incallui/res/values-da/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Igangværende Wi-Fi-opkald i forbindelse med arbejde"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ventende"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Indgående opkald"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Indgående opkald med billede"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Indgående opkald med besked"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Indgående opkald med placering"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Indgående opkald med billede og besked"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Indgående opkald med billede og placering"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Indgående opkald med besked og placering"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Indgående opkald med billede, besked og placering"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Indgående opkald med vedhæftede filer"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Vigtigt indgående opkald"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Vigtigt indgående opkald med billede"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Vigtigt indgående opkald med besked"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Vigtigt indgående opkald med placering"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Vigtigt indgående opkald med billede og besked"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Vigtigt indgående opkald med billede og placering"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Vigtigt indgående opkald med besked og placering"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Vigtigt opkald med billede, besked og placering"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Vigtigt indgående opkald med vedhæftede filer"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Indgående opkald i forbindelse med arbejde"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Indgående opkald via Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Indgående Wi-Fi-opkald i forbindelse med arbejde"</string>
diff --git a/java/com/android/incallui/res/values-de/strings.xml b/java/com/android/incallui/res/values-de/strings.xml
index a735c7050..178dbbe58 100644
--- a/java/com/android/incallui/res/values-de/strings.xml
+++ b/java/com/android/incallui/res/values-de/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktueller geschäftlicher WLAN-Anruf"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Eingehender Anruf"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Eingehender Anruf mit Foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Eingehender Anruf mit Nachricht"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Eingehender Anruf mit Standort"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Eingehender Anruf mit Foto und Nachricht"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Eingehender Anruf mit Foto und Standort"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Eingehender Anruf mit Nachricht und Standort"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Eingehender Anruf mit Foto, Nachricht und Standort"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Eingehender Anruf mit Anhängen"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Wichtiger eingehender Anruf"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Wichtiger eingehender Anruf mit Foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Wichtiger eingehender Anruf mit Nachricht"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Wichtiger eingehender Anruf mit Standort"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Wichtiger eingehender Anruf mit Foto und Nachricht"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Wichtiger eingehender Anruf mit Foto und Standort"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Wichtiger eingehender Anruf mit Nachricht und Standort"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Wichtiger eingehender Anruf mit Foto, Nachricht und Standort"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Wichtiger eingehender Anruf mit Anhängen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Eingehender geschäftlicher Anruf"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Eingehender WLAN-Anruf"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Eingehender geschäftlicher WLAN-Anruf"</string>
diff --git a/java/com/android/incallui/res/values-el/strings.xml b/java/com/android/incallui/res/values-el/strings.xml
index 6b5f8a81b..cd2834f0e 100644
--- a/java/com/android/incallui/res/values-el/strings.xml
+++ b/java/com/android/incallui/res/values-el/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Κλήση εργασίας μέσω Wi-Fi σε εξέλιξη"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Σε αναμονή"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Εισερχόμενη κλήση"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Εισερχόμενη κλήση με φωτογραφία"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Εισερχόμενη κλήση με μήνυμα"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Εισερχόμενη κλήση με τοποθεσία"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Εισερχόμενη κλήση με φωτογραφία και μήνυμα"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Εισερχόμενη κλήση με φωτογραφία και τοποθεσία"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Εισερχόμενη κλήση με μήνυμα και τοποθεσία"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Εισερχόμενη κλήση με φωτο, μήνυμα και τοποθεσία"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Εισερχόμενη κλήση με συνημμένα"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Σημαντική εισερχόμενη κλήση"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Σημαντική εισερχόμενη κλήση με φωτογραφία"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Σημαντική εισερχόμενη κλήση με μήνυμα"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Σημαντική εισερχόμενη κλήση με τοποθεσία"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Σημαντική εισερχόμενη κλήση με φωτο και μήνυμα"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Σημαντική εισερχόμενη κλήση με φωτο και τοποθεσία"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Σημαντική εισερχόμ. κλήση με μήνυμα και τοποθεσία"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Σημαντική εισερχ. κλήση με φωτο, μήνυμα, τοποθεσία"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Σημαντική εισερχόμενη κλήση με συνημμένα"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Εισερχόμενη κλήση εργασίας"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Εισερχόμενη κλήση μέσω Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Εισερχόμενη κλήση εργασίας μέσω Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-en-rAU/strings.xml b/java/com/android/incallui/res/values-en-rAU/strings.xml
index c15b06556..67eab7953 100644
--- a/java/com/android/incallui/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-en-rAU/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
diff --git a/java/com/android/incallui/res/values-en-rGB/strings.xml b/java/com/android/incallui/res/values-en-rGB/strings.xml
index c15b06556..67eab7953 100644
--- a/java/com/android/incallui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-en-rGB/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
diff --git a/java/com/android/incallui/res/values-en-rIN/strings.xml b/java/com/android/incallui/res/values-en-rIN/strings.xml
index c15b06556..67eab7953 100644
--- a/java/com/android/incallui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-en-rIN/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
diff --git a/java/com/android/incallui/res/values-es-rUS/strings.xml b/java/com/android/incallui/res/values-es-rUS/strings.xml
index 6e9be2c0e..a25b0ee83 100644
--- a/java/com/android/incallui/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-es-rUS/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada de trabajo con Wi-Fi en curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Llamada entrante con mensaje"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Llamada entrante con ubicación"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Llamada entrante con foto y mensaje"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Llamada entrante con foto y ubicación"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Llamada entrante con mensaje y ubicación"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Llamada entrante con foto, mensaje y ubicación"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Llamada entrante con archivos adjuntos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Llamada entrante importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Llamada entrante importante con foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Llamada entrante importante con mensaje"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Llamada entrante importante con ubicación"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Llamada entrante importante con foto y mensaje"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Llamada entrante importante con foto y ubicación"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Llamada importante con mensaje y ubicación"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada por Wi-Fi entrante"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada de trabajo con Wi-Fi entrante"</string>
diff --git a/java/com/android/incallui/res/values-es/strings.xml b/java/com/android/incallui/res/values-es/strings.xml
index bfd3a7e2f..8a42515e7 100644
--- a/java/com/android/incallui/res/values-es/strings.xml
+++ b/java/com/android/incallui/res/values-es/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada Wi-Fi de trabajo en curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Llamada entrante con mensaje"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Llamada entrante con ubicación"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Llamada entrante con foto y mensaje"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Llamada entrante con foto y ubicación"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Llamada entrante con mensaje y ubicación"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Llamada entrante con foto, mensaje y ubicación"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Llamada entrante con archivos adjuntos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Llamada entrante importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Llamada entrante importante con foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Llamada entrante importante con mensaje"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Llamada entrante importante con ubicación"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Llamada entrante importante con foto y mensaje"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Llamada entrante importante con foto y ubicación"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Llamada importante con mensaje y ubicación"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada Wi-Fi entrante"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada Wi-Fi de trabajo entrante"</string>
diff --git a/java/com/android/incallui/res/values-et/strings.xml b/java/com/android/incallui/res/values-et/strings.xml
index 780f0b181..d34980eb3 100644
--- a/java/com/android/incallui/res/values-et/strings.xml
+++ b/java/com/android/incallui/res/values-et/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käimasolev töökõne WiFi kaudu"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ootel"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sissetulev kõne"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Sissetulev kõne koos fotoga"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Sissetulev kõne koos sõnumiga"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Sissetulev kõne koos asukohaga"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Sissetulev kõne koos foto ja sõnumiga"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Sissetulev kõne koos foto ja asukohaga"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Sissetulev kõne koos sõnumi ja asukohaga"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Sissetulev kõne koos foto, sõnumi ja asukohaga"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Sissetulev kõne koos manustega"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Tähtis sissetulev kõne"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Tähtis sissetulev kõne koos fotoga"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Tähtis sissetulev kõne koos sõnumiga"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Tähtis sissetulev kõne koos asukohaga"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Tähtis sissetulev kõne koos foto ja sõnumiga"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Tähtis sissetulev kõne koos foto ja asukohaga"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Tähtis sissetulev kõne koos sõnumi ja asukohaga"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tähtis sisset. kõne koos foto, sõnumi ja asukohaga"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tähtis sissetulev kõne koos manustega"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Sissetulev töökõne"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sissetulev WiFi-kõne"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Sissetulev töökõne WiFi kaudu"</string>
diff --git a/java/com/android/incallui/res/values-eu/strings.xml b/java/com/android/incallui/res/values-eu/strings.xml
index 98151454f..0d3ce76e4 100644
--- a/java/com/android/incallui/res/values-eu/strings.xml
+++ b/java/com/android/incallui/res/values-eu/strings.xml
@@ -37,6 +37,40 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi bidezko laneko dei bat abian da"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zain"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sarrerako deia"</string>
+    <!-- no translation found for notification_incoming_call_with_photo (4360505044807517422) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_message (5608687985694956601) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_location (4519498445081598767) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_photo_message (316806247057497525) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_photo_location (3523930283842222367) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_message_location (319374298517482028) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_with_photo_message_location (596658237891406809) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call_attachments (3708414495376236948) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call (2867013954509930989) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_photo (4908333121583658560) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_message (1614505248246685319) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_location (7387284065036564352) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_photo_message (4577220919701434817) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_photo_location (7172208615619394502) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_message_location (7244079127080064796) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_with_photo_message_location (513692941317253479) -->
+    <skip />
+    <!-- no translation found for important_notification_incoming_call_attachments (4594375776340303751) -->
+    <skip />
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Laneko dei bat jaso da"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sarrerako Wi-Fi deia"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi bidezko laneko dei bat jaso da"</string>
diff --git a/java/com/android/incallui/res/values-fa/strings.xml b/java/com/android/incallui/res/values-fa/strings.xml
index b41cc4006..bce99b7f3 100644
--- a/java/com/android/incallui/res/values-fa/strings.xml
+++ b/java/com/android/incallui/res/values-fa/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏تماس کاری Wi-Fi خروجی"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"در انتظار"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"تماس ورودی"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تماس ورودی به همراه عکس"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"تماس ورودی به همراه پیام"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"تماس ورودی به همراه مکان"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"تماس ورودی به همراه عکس و پیام"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"تماس ورودی به همراه عکس و مکان"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"تماس ورودی به همراه پیام و مکان"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"تماس ورودی به همراه عکس، پیام و مکان"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"تماس ورودی به همراه پیوست"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"تماس ورودی مهم"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"تماس ورودی مهم به همراه عکس"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"تماس ورودی مهم به همراه پیام"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"تماس ورودی مهم به همراه مکان"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"تماس ورودی مهم به همراه عکس و پیام"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"تماس ورودی مهم به همراه عکس و مکان"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"تماس ورودی مهم به همراه پیام و مکان"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تماس ورودی مهم به همراه عکس، پیام و مکان"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"تماس ورودی مهم به همراه پیوست"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"تماس کاری ورودی"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏تماس Wi-Fi ورودی"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏تماس کاری Wi-Fi ورودی"</string>
diff --git a/java/com/android/incallui/res/values-fi/strings.xml b/java/com/android/incallui/res/values-fi/strings.xml
index 1aa55628f..57b4449ee 100644
--- a/java/com/android/incallui/res/values-fi/strings.xml
+++ b/java/com/android/incallui/res/values-fi/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käynnissä oleva Wi-Fi-työpuhelu"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Pidossa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Kuvan sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Viestin sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Sijainnin sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Kuvan ja viestin sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Kuvan ja sijainnin sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Viestin ja sijainnin sisältävä saapuva puhelu"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Kuvan, viestin ja sijainnin sisältävä puhelu"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Liitteitä sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Tärkeä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Tärkeä kuvan sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Tärkeä viestin sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Tärkeä sijainnin sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Tärkeä kuvan ja viestin sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Tärkeä kuvan ja sijainnin sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Tärkeä viestin ja sijainnin sisältävä puhelu"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Saapuva työpuhelu"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Saapuva Wi-Fi-puhelu"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Saapuva Wi-Fi-työpuhelu"</string>
diff --git a/java/com/android/incallui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/res/values-fr-rCA/strings.xml
index 87b363721..b0b01fc18 100644
--- a/java/com/android/incallui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi en cours - travail"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Appel entrant avec message"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Appel entrant avec position"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Appel entrant avec photo et message"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Appel entrant avec photo et position"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Appel entrant avec message et position"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Appel entrant avec photo, message et position"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Appel entrant avec pièces jointes"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Appel entrant important"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Appel entrant important avec photo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Appel entrant important avec message"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Appel entrant important avec position"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Appel entrant important avec photo et message"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Appel entrant important avec photo et position"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Appel entrant important avec message et position"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel entrant - travail"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi entrant - travail"</string>
diff --git a/java/com/android/incallui/res/values-fr/strings.xml b/java/com/android/incallui/res/values-fr/strings.xml
index 5534d2f63..0a9d4a0fe 100644
--- a/java/com/android/incallui/res/values-fr/strings.xml
+++ b/java/com/android/incallui/res/values-fr/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi professionnel en cours"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Appel entrant avec message"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Appel entrant avec position"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Appel entrant avec photo et message"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Appel entrant avec photo et position"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Appel entrant avec message et position"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Appel entrant avec photo, message et position"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Appel entrant avec pièces jointes"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Appel entrant important"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Appel entrant important avec photo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Appel entrant important avec message"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Appel entrant important avec position"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Appel entrant important avec photo et message"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Appel entrant important avec photo et position"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Appel entrant important avec message et position"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel professionnel entrant"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi professionnel entrant"</string>
diff --git a/java/com/android/incallui/res/values-gl/strings.xml b/java/com/android/incallui/res/values-gl/strings.xml
index c089737d3..675a77ff0 100644
--- a/java/com/android/incallui/res/values-gl/strings.xml
+++ b/java/com/android/incallui/res/values-gl/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada wifi de traballo saínte"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada entrante"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada entrante con foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada entrante con mensaxe"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada entrante con localización"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada entrante con foto e mensaxe"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada entrante con foto e localización"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada entrante con mensaxe e localización"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada entrante con foto, mensaxe e localización"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada entrante con anexos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada entrante importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada entrante importante con foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada entrante importante con mensaxe"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada entrante importante con localización"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada entrante importante con foto e mensaxe"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada entrante importante con foto e localización"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada entrante importante con mensaxe e localización"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada entrante importante con foto, mensaxe e localización"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada entrante importante con anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de traballo entrante"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada wifi entrante"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada wifi de traballo entrante"</string>
diff --git a/java/com/android/incallui/res/values-gu/strings.xml b/java/com/android/incallui/res/values-gu/strings.xml
index 17dbb45f9..9088624f6 100644
--- a/java/com/android/incallui/res/values-gu/strings.xml
+++ b/java/com/android/incallui/res/values-gu/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ચાલી રહેલ Wi-Fi કાર્ય કૉલ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"હોલ્ડ પર"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ફોટો સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"સંદેશ સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ફોટો અને સંદેશ સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ફોટો અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ફોટો, સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"જોડાણો સાથે ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ફોટો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ફોટો અને સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ફોટો અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ફોટો, સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"જોડાણો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ઇનકમિંગ કાર્ય કૉલ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ઇનકમિંગ Wi-Fi કૉલ"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ઇનકમિંગ Wi-Fi કાર્ય કૉલ"</string>
diff --git a/java/com/android/incallui/res/values-hi/strings.xml b/java/com/android/incallui/res/values-hi/strings.xml
index 84508161f..8d5e1bb5f 100644
--- a/java/com/android/incallui/res/values-hi/strings.xml
+++ b/java/com/android/incallui/res/values-hi/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"कार्यस्थल की जारी वाई-फ़ाई कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फ़ोटो के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"संदेश के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थान के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"फ़ोटो और संदेश के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"फ़ोटो और स्थान के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"संदेश और स्थान के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"फ़ोटो, संदेश और स्थान के साथ इनकमिंग कॉल"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"अटैचमेंट के साथ इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"फ़ोटो के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"संदेश के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"फ़ोटो और संदेश के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"फ़ोटो और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"अटैचमेंट के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"कार्यस्थल की आवक कॉल"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"इनकमिंग वाई-फ़ाई कॉल"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"कार्यस्थल की वाई-फ़ाई आवक कॉल"</string>
diff --git a/java/com/android/incallui/res/values-hr/strings.xml b/java/com/android/incallui/res/values-hr/strings.xml
index c5a2ea96c..ff43e6836 100644
--- a/java/com/android/incallui/res/values-hr/strings.xml
+++ b/java/com/android/incallui/res/values-hr/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Poslovni Wi-Fi poziv u tijeku"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dolazni poziv s porukom"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dolazni poziv s lokacijom"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dolazni poziv s fotografijom i porukom"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dolazni poziv s fotografijom i lokacijom"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dolazni poziv s porukom i lokacijom"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dolazni poziv s fotografijom, porukom i lokacijom"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dolazni poziv s privicima"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Važan dolazni poziv"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Važan dolazni poziv s fotografijom"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Važan dolazni poziv s porukom"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Važan dolazni poziv s lokacijom"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Važan dolazni poziv s fotografijom i porukom"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Važan dolazni poziv s fotografijom i lokacijom"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Važan dolazni poziv s porukom i lokacijom"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s privicima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni poslovni Wi-Fi poziv"</string>
diff --git a/java/com/android/incallui/res/values-hu/strings.xml b/java/com/android/incallui/res/values-hu/strings.xml
index e7de37478..3fad07190 100644
--- a/java/com/android/incallui/res/values-hu/strings.xml
+++ b/java/com/android/incallui/res/values-hu/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Folyamatban lévő munkahelyi hívás Wi-Fin keresztül"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Bejövő hívás"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Bejövő hívás fotóval"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Bejövő hívás üzenettel"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Bejövő hívás hellyel"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Bejövő hívás fotóval és üzenettel"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Bejövő hívás fotóval és hellyel"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Bejövő hívás üzenettel és hellyel"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Bejövő hívás fotóval, üzenettel és hellyel"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Bejövő hívás mellékletekkel"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Fontos bejövő hívás"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Fontos bejövő hívás fotóval"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Fontos bejövő hívás üzenettel"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Fontos bejövő hívás hellyel"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Fontos bejövő hívás fotóval és üzenettel"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Fontos bejövő hívás fotóval és hellyel"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Fontos bejövő hívás üzenettel és hellyel"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fontos bejövő hívás fotóval, üzenettel és hellyel"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Fontos bejövő hívás mellékletekkel"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Bejövő munkahelyi hívás"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Beérkező Wi-Fi-hívás"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Bejövő munkahelyi hívás Wi-Fin keresztül"</string>
diff --git a/java/com/android/incallui/res/values-hy/strings.xml b/java/com/android/incallui/res/values-hy/strings.xml
index 39d7f5c10..aabeae2d5 100644
--- a/java/com/android/incallui/res/values-hy/strings.xml
+++ b/java/com/android/incallui/res/values-hy/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ընթացիկ աշխատանքային Wi-Fi զանգ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Սպասում"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Մուտքային զանգ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Մուտքային զանգ՝ լուսանկարով"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Մուտքային զանգ՝ հաղորդագրությամբ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Մուտքային զանգ՝ տեղադրության տվյալներով"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Մուտքային զանգ՝ լուսանկարով և հաղորդագրությամբ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Զանգ՝ լուսանկարով և տեղադրության տվյալներով"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Զանգ՝ հաղորդագրությամբ և տեղադրության տվյալներով"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Մուտքային զանգ՝ կցորդներով"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Մուտքային զանգ՝ կցորդներով"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Կարևոր մուտքային զանգ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Կարևոր մուտքային զանգ՝ լուսանկարով"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Կարևոր մուտքային զանգ՝ հողորդագրությամբ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Կարևոր մուտքային զանգ՝ տեղադրության տվյալներով"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Կարևոր զանգ՝ լուսանկարով և հաղորդագրությամբ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Կարևոր զանգ՝ լուսանկարով և տեղադրության տվյալներով"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Մուտքային աշխատանքային զանգ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Մուտքային զանգ Wi-Fi-ի միջոցով"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Մուտքային աշխատանքային Wi-Fi զանգ"</string>
diff --git a/java/com/android/incallui/res/values-in/strings.xml b/java/com/android/incallui/res/values-in/strings.xml
index 981360a33..e2b040540 100644
--- a/java/com/android/incallui/res/values-in/strings.xml
+++ b/java/com/android/incallui/res/values-in/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggilan Wi-Fi kerja yang sedang berlangsung"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditangguhkan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Panggilan masuk dengan pesan"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Panggilan masuk dengan lokasi"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Panggilan masuk dengan foto dan pesan"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Panggilan masuk dengan foto dan lokasi"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Panggilan masuk dengan pesan dan lokasi"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Panggilan masuk dengan foto, pesan, dan lokasi"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Panggilan masuk dengan lampiran"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Panggilan masuk penting"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Panggilan masuk penting dengan foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Panggilan masuk penting dengan pesan"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Panggilan masuk penting dengan lokasi"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Panggilan masuk penting dengan foto dan pesan"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Panggilan masuk penting dengan foto dan lokasi"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Panggilan masuk penting dengan pesan dan lokasi"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan penting dengan foto, pesan, dan lokasi"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan telepon kerja yang masuk"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan telepon Wi-Fi kerja yang masuk"</string>
diff --git a/java/com/android/incallui/res/values-is/strings.xml b/java/com/android/incallui/res/values-is/strings.xml
index fdbaf5e4b..ede4a4cbe 100644
--- a/java/com/android/incallui/res/values-is/strings.xml
+++ b/java/com/android/incallui/res/values-is/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vinnusímtal í gangi um Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Í bið"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Móttekið símtal"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Móttekið símtal með mynd"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Móttekið símtal með skilaboðum"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Móttekið símtal með staðsetningu"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Móttekið símtal með mynd og skilaboðum"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Móttekið símtal með mynd og staðsetningu"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Móttekið símtal með skilaboðum og staðsetningu"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Móttekið símtal með viðhengjum"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Mikilvægt móttekið símtal"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Mikilvægt móttekið símtal með mynd"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mikilvægt móttekið símtal með skilaboðum"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Mikilvægt móttekið símtal með staðsetningu"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Mikilvægt móttekið símtal með mynd og skilaboðum"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Mikilvægt móttekið símtal með mynd og staðsetningu"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mikilvægt móttekið símtal með skilaboðum og staðsetningu"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mikilvægt móttekið símtal með viðhengjum"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Vinnusímtal berst"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi símtal berst"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Vinnusímtal berst um Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-it/strings.xml b/java/com/android/incallui/res/values-it/strings.xml
index bd00d520a..8e872b8d5 100644
--- a/java/com/android/incallui/res/values-it/strings.xml
+++ b/java/com/android/incallui/res/values-it/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiamata di lavoro tramite Wi-Fi in corso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In attesa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chiamata in arrivo"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chiamata in arrivo con foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chiamata in arrivo con messaggio"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chiamata in arrivo con posizione"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chiamata in arrivo con foto e messaggio"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chiamata in arrivo con foto e posizione"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chiamata in arrivo con messaggio e posizione"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chiamata in arrivo con foto, messaggio e posizione"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chiamata in arrivo con allegato"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chiamata in arrivo importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chiamata in arrivo importante con foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chiamata in arrivo importante con messaggio"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chiamata in arrivo importante con posizione"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chiamata in arrivo importante con foto e messaggio"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chiamata importante in arrivo con foto e posizione"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chiamata importante in arrivo con messaggio e posizione"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chiamata importante in arrivo con foto, messaggio e posizione"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chiamata importante in arrivo con allegati"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chiamata di lavoro in arrivo"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chiamata Wi-Fi in arrivo"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chiamata di lavoro in arrivo tramite Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-iw/strings.xml b/java/com/android/incallui/res/values-iw/strings.xml
index b51cf78fb..6310aa1ca 100644
--- a/java/com/android/incallui/res/values-iw/strings.xml
+++ b/java/com/android/incallui/res/values-iw/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏שיחת עבודה פעילה ברשת WiFi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"בהמתנה"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"שיחה נכנסת"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"שיחה נכנסת עם תמונה"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"שיחה נכנסת עם הודעה"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"שיחה נכנסת עם מיקום"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"שיחה נכנסת עם תמונה והודעה"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"שיחה נכנסת עם תמונה ומיקום"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"שיחה נכנסת עם הודעה ומיקום"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"שיחה נכנסת עם תמונה, הודעה ומיקום"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"שיחה נכנסת עם קבצים מצורפים"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"שיחה נכנסת חשובה"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"שיחה נכנסת חשובה עם תמונה"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"שיחה נכנסת חשובה עם הודעה"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"שיחה נכנסת חשובה עם מיקום"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"שיחה נכנסת חשובה עם תמונה והודעה"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"שיחה נכנסת חשובה עם תמונה ומיקום"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"שיחה נכנסת חשובה עם הודעה ומיקום"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"שיחה נכנסת חשובה עם תמונה, הודעה ומיקום"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"שיחה נכנסת חשובה עם קבצים מצורפים"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"שיחת עבודה נכנסת"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏שיחת Wi-Fi נכנסת"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏שיחת עבודה נכנסת ברשת WiFi"</string>
diff --git a/java/com/android/incallui/res/values-ja/strings.xml b/java/com/android/incallui/res/values-ja/strings.xml
index 14dd9fb36..b621250e9 100644
--- a/java/com/android/incallui/res/values-ja/strings.xml
+++ b/java/com/android/incallui/res/values-ja/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"仕事の Wi-Fi 通話中"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留中"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"通話着信"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"着信（写真あり）"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"着信（メッセージあり）"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"着信（位置情報あり）"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"着信（写真、メッセージあり）"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"着信（写真、位置情報あり）"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"着信（メッセージ、位置情報あり）"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"着信（写真、メッセージ、位置情報あり）"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"着信（添付ファイルあり）"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要な着信"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"重要な着信（写真あり）"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"重要な着信（メッセージあり）"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"重要な着信（位置情報あり）"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"重要な着信（写真、メッセージあり）"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"重要な着信（写真、位置情報あり）"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"重要な着信（メッセージ、位置情報あり）"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"重要な着信（写真、メッセージ、位置情報あり）"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"重要な着信（添付ファイルあり）"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"仕事の通話が着信中"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi通話が着信中"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"仕事の Wi-Fi 通話が着信中"</string>
diff --git a/java/com/android/incallui/res/values-ka/strings.xml b/java/com/android/incallui/res/values-ka/strings.xml
index 032b796b6..1bb9ae79d 100644
--- a/java/com/android/incallui/res/values-ka/strings.xml
+++ b/java/com/android/incallui/res/values-ka/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"მიმდინარე Wi-Fi ზარი (სამსახური)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"შეყოვნების რეჟიმში"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"შემომავალი ზარი"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"შემომავალი ზარი ფოტოთი"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"შემომავალი ზარი შეტყობინებით"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"შემომავალი ზარი მდებარეობით"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"შემომავალი ზარი ფოტოთი და შეტყობინებით"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"შემომავალი ზარი ფოტოთი და მდებარეობით"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"შემომავალი ზარი შეტყობინებით და მდებარეობით"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"შემომავ. ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"შემომავალი ზარი დანართებით"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"მნიშვნელოვანი შემომავალი ზარი"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"მნიშვნელოვანი შემომავალი ზარი ფოტოთი"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"მნიშვნელოვანი ზარი შეტყობინებით"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"მნიშვნელოვანი შემომავალი ზარი მდებარეობით"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"მნიშვნელოვანი ზარი ფოტოთი და შეტყობინებით"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"მნიშვნელოვანი ზარი ფოტოთი და მდებარეობით"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"მნიშვნელოვანი ზარი შეტყობინებით და მდებარეობით"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"მნიშვნელოვანი შემომავალი ზარი დანართებით"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"შემომავალი ზარი (სამსახური)"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"შემომავალი Wi-Fi ზარი"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"შემომავალი Wi-Fi ზარი (სამსახური)"</string>
diff --git a/java/com/android/incallui/res/values-kk/strings.xml b/java/com/android/incallui/res/values-kk/strings.xml
index 672574563..a08bf54bc 100644
--- a/java/com/android/incallui/res/values-kk/strings.xml
+++ b/java/com/android/incallui/res/values-kk/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ағымдағы Wi-Fi жұмыс қоңырауы"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтуде"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Келген қоңырау"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сурет тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Хабар тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Орын дерегі тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Сурет және хабар тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Сурет және орын дерегі тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Хабар және орын дерегі тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Сурет, хабар және орын дерегі тіркелген кіріс қоңырау"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Тіркемелері бар кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Сурет тіркелген маңызды қоңырау"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Хабар тіркелген маңызды кіріс қоңырауы"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Орын дерегі көрсетілген маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Сурет және хабар тіркелген маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Сурет және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сурет, хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тіркемелері бар маңызды кіріс қоңырау"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Кіріс жұмыс қоңырауы"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кіріс Wi-Fi қоңырауы"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Кіріс Wi-Fi жұмыс қоңырауы"</string>
diff --git a/java/com/android/incallui/res/values-km/strings.xml b/java/com/android/incallui/res/values-km/strings.xml
index 6fad369e2..6b2c65e8a 100644
--- a/java/com/android/incallui/res/values-km/strings.xml
+++ b/java/com/android/incallui/res/values-km/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ការហៅតាម Wi-Fi ពីកន្លែងការងារកំពុងដំណើរការ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ការ​ហៅ​ចូល"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ការហៅ​ចូល​​ដែល​មាន​រូបថត"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ការ​ហោ​ចូល​ដែល​មាន​​សារ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ការ​ហៅ​ចូល​ដែល​មាន​​ទីតាំង"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​សារ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​ទីតាំង"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ការ​ហៅ​ចូល​ដែល​សារ និង​ទីតាំង"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត សារ និង​ទីតាំង"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ការ​ហៅ​ចូល​ដែល​មាន​ឯកសារ​ភ្ជាប់"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ការ​ហៅ​ចូល​ដែល​សំខាន់"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ការ​ហៅ​ចូល​ដែល​សំខាន់​​មាន​រូបថត"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ការហៅ​ចូល​ដែល​សំខាន់​​​មាន​សារ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​ទីតាំង"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត និង​សារ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​​រូបថត និង​ទីតាំង"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​សារ និង​ទីតាំង"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត សារ និង​ទីតាំង"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ការហៅ​​ចូល​ដែល​សំខាន់​មាន​ឯកសារ​ភ្ជាប់"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"កំពុងហៅចូលពីកន្លែងការងារ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"មានការហៅចូលមកតាម Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"កំពុងហៅចូលពីកន្លែងការងារតាម Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-kn/strings.xml b/java/com/android/incallui/res/values-kn/strings.xml
index 939876e15..7559d1b61 100644
--- a/java/com/android/incallui/res/values-kn/strings.xml
+++ b/java/com/android/incallui/res/values-kn/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ಒಳಬರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ಒಳಬರುವ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ಒಳಬರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
diff --git a/java/com/android/incallui/res/values-ko/strings.xml b/java/com/android/incallui/res/values-ko/strings.xml
index c376d29db..3778b585d 100644
--- a/java/com/android/incallui/res/values-ko/strings.xml
+++ b/java/com/android/incallui/res/values-ko/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"발신 Wi-Fi 업무 전화"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"대기 중"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"수신전화"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"사진이 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"메시지가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"위치가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"사진과 메시지가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"사진과 위치가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"메시지와 위치가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"사진, 메시지, 위치가 있는 수신 전화"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"첨부파일이 있는 수신 전화"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"사진이 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"메시지가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"위치가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"사진과 메시지가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"사진과 위치가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"메시지와 위치가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"사진, 메시지, 위치가 있는 중요한 수신 전화"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"첨부파일이 있는 중요한 수신 전화"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"수신 업무 전화"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 수신 전화"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"수신 Wi-Fi 업무 전화"</string>
diff --git a/java/com/android/incallui/res/values-ky/strings.xml b/java/com/android/incallui/res/values-ky/strings.xml
index 7c32b758c..e010022f3 100644
--- a/java/com/android/incallui/res/values-ky/strings.xml
+++ b/java/com/android/incallui/res/values-ky/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Учурда болуп жаткан Wi-Fi чалуу (жумуш боюнча)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтүлүүдө"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сүрөтү бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Билдирүүсү бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Жайгашкан жери бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Сүрөт менен билдирүүсү бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Сүрөт жана жайгашкан жери бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Билдирүү менен жайгашкан жери бар кирүүчү чалуу"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Сүрөт, билдирүү жана жайгашкан жери бар чалуу"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Тиркемеси бар кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Маанилүү кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Сүрөтү бар маанилүү кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Билдирүүсү бар маанилүү кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Жайгашкан жери бар маанилүү кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Сүрөт жана билдирүүсү бар маанилүү кирүүчү чалуу"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Сүрөт жана жайгашкан жери бар маанилүү чалуу"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Билдирүү жана жайгашкан жери бар маанилүү чалуу"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сүрөт, билдирүү жана жайгашкан жер бар маанилүү чалуу"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тиркемелери бар маанилүү кирүүчү чалуу"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Жумуш боюнча келип жаткан чалуу"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кирүүчү Wi-Fi чалуу"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Жумуш боюнча келип жаткан Wi-Fi чалуу"</string>
diff --git a/java/com/android/incallui/res/values-lo/strings.xml b/java/com/android/incallui/res/values-lo/strings.xml
index 01dd55be9..fcd7f5fb6 100644
--- a/java/com/android/incallui/res/values-lo/strings.xml
+++ b/java/com/android/incallui/res/values-lo/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ສາຍໂທອອກ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ສາຍໂທເຂົ້າ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ສາຍໂທເຂົ້າພ້ອມສະຖານທີ່"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ສະຖານທີ່"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ສາຍໂທເຂົ້າພ້ອມໄຟລ໌ແນບ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ສາຍໂທເຂົ້າສຳຄັນ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມສະຖານທີ່"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ສະຖານທີ່"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມໄຟລ໌ແນບ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ສາຍໂທເຂົ້າຈາກບ່ອນເຮັດວຽກ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ສາຍໂທເຂົ້າ Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ສາຍໂທເຂົ້າ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
diff --git a/java/com/android/incallui/res/values-lt/strings.xml b/java/com/android/incallui/res/values-lt/strings.xml
index 05c7cbd4a..7d79fce96 100644
--- a/java/com/android/incallui/res/values-lt/strings.xml
+++ b/java/com/android/incallui/res/values-lt/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vykstantis „Wi-Fi“ darbo skambutis"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gaunamasis skambutis"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Gaunamasis skambutis su nuotrauka"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Gaunamasis skambutis su pranešimu"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Gaunamasis skambutis su vietove"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Gaunamasis skambutis su nuotrauka ir pranešimu"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Gaunamasis skambutis su nuotrauka ir vietove"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Gaunamasis skambutis su pranešimu ir vietove"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Gaunamasis skamb. su nuotrauka, praneš. ir vietove"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Gaunamasis skambutis su priedais"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Svarbus gaunamasis skambutis"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Svarbus gaunamasis skambutis su nuotrauka"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Svarbus gaunamasis skambutis su pranešimu"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Svarbus gaunamasis skambutis su vietove"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Svarbus gaunamasis skamb. su nuotrauka ir praneš."</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Svarbus gaunamasis skamb. su nuotrauka ir vietove"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Svarbus gaunamasis skamb. su pranešimu ir vietove"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Svarbus gaunam. skamb. su nuotr., praneš. ir viet."</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarbus gaunamasis skambutis su priedais"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gaunamasis darbo skambutis"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gaunamasis „Wi-Fi“ skambutis"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gaunamasis „Wi-Fi“ darbo skambutis"</string>
diff --git a/java/com/android/incallui/res/values-lv/strings.xml b/java/com/android/incallui/res/values-lv/strings.xml
index b7e151eff..f144a9a5d 100644
--- a/java/com/android/incallui/res/values-lv/strings.xml
+++ b/java/com/android/incallui/res/values-lv/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Notiekošs darba Wi-Fi zvans"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ienākošais zvans"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ienākošais zvans ar fotoattēlu"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Ienākošais zvans ar ziņojumu"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Ienākošais zvans ar atrašanās vietu"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Ienākošais zvans ar fotoattēlu un ziņojumu"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Ienākošais zvans ar fotoattēlu un atrašanās vietu"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Ienākošais zvans ar ziņojumu un atrašanās vietu"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ienākošais zvans ar pielikumiem"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Svarīgs ienākošais zvans"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Svarīgs ienākošais zvans ar fotoattēlu"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Svarīgs ienākošais zvans ar ziņojumu"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Svarīgs ienākošais zvans ar atrašanās vietu"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Svarīgs ienākošais zvans ar fotoattēlu un ziņojumu"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Svarīgs zvans ar fotoattēlu un atrašanās vietu"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Svarīgs zvans ar ziņojumu un atrašanās vietu"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarīgs ienākošais zvans ar pielikumiem"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ienākošs darba zvans"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ienākošs Wi-Fi zvans"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ienākošs darba Wi-Fi zvans"</string>
diff --git a/java/com/android/incallui/res/values-mk/strings.xml b/java/com/android/incallui/res/values-mk/strings.xml
index 96f6bbbe2..4bc848ebe 100644
--- a/java/com/android/incallui/res/values-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mk/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Тековен работен повик преку Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекање"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Дојдовен повик"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Дојдовен повик со фотографија"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Дојдовен повик со порака"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Дојдовен повик со локација"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Дојдовен повик со фотографија и порака"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Дојдовен повик со фотографија и локација"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Дојдовен повик со порака и локација"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Дојдовен повик со фотографија, порака и локација"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Дојдовен повик со прилози"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важен дојдовен повик"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важен дојдовен повик со фотографија"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важен дојдовен повик со порака"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важен дојдовен повик со локација"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важен дојдовен повик со фотографија и порака"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важен дојдовен повик со фотографија и локација"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важен дојдовен повик со порака и локација"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важен дојдовен повик со фото., порака и локација"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важен дојдовен повик со прилози"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Дојдовен работен повик"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Дојдовен повик преку Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Дојдовен работен повик преку Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-ml/strings.xml b/java/com/android/incallui/res/values-ml/strings.xml
index b748f6a09..4364f8a3d 100644
--- a/java/com/android/incallui/res/values-ml/strings.xml
+++ b/java/com/android/incallui/res/values-ml/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ഓൺഗോയിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ഹോള്‍ഡിലാണ്"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ഇന്‍കമിംഗ് കോള്‍"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ഫോട്ടോ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"സന്ദേശം ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ലൊക്കേഷൻ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ഫോട്ടോ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"സന്ദേശം ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ലൊക്കേഷൻ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ഇൻകമിംഗ് ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ഇൻകമിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
diff --git a/java/com/android/incallui/res/values-mn/strings.xml b/java/com/android/incallui/res/values-mn/strings.xml
index ed86556f1..25d788dd4 100644
--- a/java/com/android/incallui/res/values-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mn/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Залгаж буй Wi-Fi албаны дуудлага"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Хүлээлгэнд"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ирж буй дуудлага"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Зураг бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Зурвас бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Байршил бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Зураг болон зурвас бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Зураг болон байршил бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Зурвас болон байршил бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Зураг, зурвас, байршил бүхий орж ирсэн дуудлага"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Хавсралт бүхий орж ирсэн дуудлага"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Зураг бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Зурвас бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Байршил бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Зураг, зурвас бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Зураг, байршил бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Зурвас, байршил бүхий орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Зураг, зурвас, байршилтай орж ирсэн чухал дуудлага"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Хавсралт бүхий орж ирсэн чухал дуудлага"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ирж буй албаны дуудлага"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Орж ирсэн Wi-Fi дуудлага"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ирж буй Wi-Fi албаны дуудлага"</string>
diff --git a/java/com/android/incallui/res/values-mr/strings.xml b/java/com/android/incallui/res/values-mr/strings.xml
index d6c226d14..d966e1476 100644
--- a/java/com/android/incallui/res/values-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mr/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"सुरु असलेला वाय-फाय कार्य कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड वर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फोटोसह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"संदेशासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थानासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"फोटो आणि संदेशासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"फोटो आणि स्थानासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"संदेश आणि स्थानासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"फोटो, संदेश आणि स्थानासह येणारा कॉल"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"संलग्नकांसह येणारा कॉल"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"फोटोसह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"संदेशासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थानासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"फोटो आणि संदेशासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"फोटो आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"संलग्नकांसह महत्त्वाचा येणारा कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"येणारा कार्य कॉल"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"येणारा वाय-फाय कॉल"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"येणारा वाय-फाय कार्य कॉल"</string>
diff --git a/java/com/android/incallui/res/values-ms/strings.xml b/java/com/android/incallui/res/values-ms/strings.xml
index c75f8cc8e..2268a5977 100644
--- a/java/com/android/incallui/res/values-ms/strings.xml
+++ b/java/com/android/incallui/res/values-ms/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggian Wi-Fi sedang berlangsung daripada tempat kerja"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Panggilan masuk dengan mesej"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Panggilan masuk dengan lokasi"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Panggilan masuk dengan foto dan mesej"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Panggilan masuk dengan foto dan lokasi"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Panggilan masuk dengan mesej dan lokasi"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Panggilan masuk dengan foto, mesej dan lokasi"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Panggilan masuk dengan lampiran"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Panggilan masuk penting"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Panggilan masuk penting dengan foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Panggilan masuk penting dengan mesej"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Panggilan masuk penting dengan lokasi"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Panggilan masuk penting dengan foto dan mesej"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Panggilan masuk penting dengan foto dan lokasi"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Panggilan masuk penting dengan mesej dan lokasi"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan masuk penting dengan foto, mesej dan lokasi"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan masuk daripada tempat kerja"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan masuk melalui Wi-Fi daripada tempat kerja"</string>
diff --git a/java/com/android/incallui/res/values-my/strings.xml b/java/com/android/incallui/res/values-my/strings.xml
index 37594a3df..a1c8bea6a 100644
--- a/java/com/android/incallui/res/values-my/strings.xml
+++ b/java/com/android/incallui/res/values-my/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ခေါ်နေဆဲ Wi-Fi အလုပ်မှ ခေါ်ဆိုမှု"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ခဏ ကိုင်ထားစဉ်"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ဓာတ်ပုံဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"မက်ဆေ့ဂျ်ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်တို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ဓာတ်ပုံနှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"မက်ဆေ့ဂျ်နှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ဓာတ်ပုံ၊ မက်ဆေ့ဂျ်၊ တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ပူးတွဲပါဖိုင်များဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ဓာတ်ပုံဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"တည်နေရာဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ဓာတ်ပုံနှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"မက်ဆေ့ဂျ်နှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ဓာတ်ပုံ၊မက်ဆေ့ဂျ်၊တည်နေရာဖြင့် အရေးကြီးခေါ်ဆိုမှု"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ပူးတွဲပါဖိုင်များဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"အဝင် ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ဝင်လာသော ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi အလုပ်မှ အဝင် ခေါ်ဆိုမှု"</string>
diff --git a/java/com/android/incallui/res/values-nb/strings.xml b/java/com/android/incallui/res/values-nb/strings.xml
index 52ff32a10..bb2cf692d 100644
--- a/java/com/android/incallui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/res/values-nb/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Innkommende anrop med melding"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Innkommende anrop med posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Innkommende anrop med bilde og melding"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Innkommende anrop med bilde og posisjon"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Innkommende anrop med melding og posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Innkommende anrop med bilde, melding og posisjon"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Innkommende anrop med vedlegg"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktig innkommende anrop"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktig innkommende anrop med bilde"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktig innkommende anrop med melding"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktig innkommende anrop med posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktig innkommende anrop med bilde og melding"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktig innkommende anrop med bilde og posisjon"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktig innkommende anrop med melding og posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-ne/strings.xml b/java/com/android/incallui/res/values-ne/strings.xml
index c5a097297..5b5ff1bb5 100644
--- a/java/com/android/incallui/res/values-ne/strings.xml
+++ b/java/com/android/incallui/res/values-ne/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"चालू रहेको Wi-Fi कार्यको कल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्डमा"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"आगमन कल"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"तस्बिर सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"सन्देश सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थान सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"तस्बिर र सन्देश सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"तस्बिर र स्थान सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"सन्देश र स्थान सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"तस्बिर, सन्देश र स्थान सहितको आगमन कल"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"समावेश गरिएको वस्तु सहितको आगमन कल"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"तस्बिर सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"सन्देश सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थान सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"तस्बिर र सन्देश सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"तस्बिर र स्थान सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"सन्देश र स्थान सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"तस्बिर, सन्देश र स्थान सहितको महत्त्वपूर्ण आगमन कल"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"समावेश गरिएको वस्तु सहितको महत्त्वपूर्ण आगमन कल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"आगमन कार्यको कल"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"आगमन Wi-Fi कल"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"आगमन Wi-Fi कार्यको कल"</string>
diff --git a/java/com/android/incallui/res/values-nl/strings.xml b/java/com/android/incallui/res/values-nl/strings.xml
index 7b1a59d14..8601fe27e 100644
--- a/java/com/android/incallui/res/values-nl/strings.xml
+++ b/java/com/android/incallui/res/values-nl/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Actieve zakelijke oproep via wifi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkomende oproep met bericht"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkomende oproep met locatie"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkomende oproep met foto en bericht"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkomende oproep met foto en locatie"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkomende oproep met bericht en locatie"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkomende oproep met foto, bericht en locatie"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkomende oproep met bijlagen"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Belangrijke inkomende oproep"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Belangrijke inkomende oproep met foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Belangrijke inkomende oproep met bericht"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Belangrijke inkomende oproep met locatie"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Belangrijke inkomende oproep met foto en bericht"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Belangrijke inkomende oproep met foto en locatie"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Belangrijke oproep met bericht en locatie"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrijke oproep met foto, bericht en locatie"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrijke inkomende oproep met bijlagen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende zakelijke oproep"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende wifi-oproep"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende zakelijke oproep via wifi"</string>
diff --git a/java/com/android/incallui/res/values-no/strings.xml b/java/com/android/incallui/res/values-no/strings.xml
index 52ff32a10..bb2cf692d 100644
--- a/java/com/android/incallui/res/values-no/strings.xml
+++ b/java/com/android/incallui/res/values-no/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Innkommende anrop med melding"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Innkommende anrop med posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Innkommende anrop med bilde og melding"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Innkommende anrop med bilde og posisjon"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Innkommende anrop med melding og posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Innkommende anrop med bilde, melding og posisjon"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Innkommende anrop med vedlegg"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktig innkommende anrop"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktig innkommende anrop med bilde"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktig innkommende anrop med melding"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktig innkommende anrop med posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktig innkommende anrop med bilde og melding"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktig innkommende anrop med bilde og posisjon"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktig innkommende anrop med melding og posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-pa/strings.xml b/java/com/android/incallui/res/values-pa/strings.xml
index 5fadeb10b..ebd8a25e6 100644
--- a/java/com/android/incallui/res/values-pa/strings.xml
+++ b/java/com/android/incallui/res/values-pa/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ Wi-Fi ਕਾਲ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ਹੋਲਡ ਤੇ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ਫ਼ੋਟੋ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ਫ਼ੋਟੋ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ ਕਾਲ"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ਇਨਕਮਿੰਗ Wi-Fi ਕਾਲ"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ Wi-Fi ਕਾਲ"</string>
diff --git a/java/com/android/incallui/res/values-pl/strings.xml b/java/com/android/incallui/res/values-pl/strings.xml
index 4133dc831..5f818ae7b 100644
--- a/java/com/android/incallui/res/values-pl/strings.xml
+++ b/java/com/android/incallui/res/values-pl/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trwa połączenie służbowe przez Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Połączenie"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Połączenie przychodzące ze zdjęciem"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Połączenie przychodzące z wiadomością"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Połączenie przychodzące z lokalizacją"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Połączenie przychodzące ze zdjęciem i wiadomością"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Połączenie przychodzące ze zdjęciem i lokalizacją"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Połączenie z wiadomością i lokalizacją"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Połączenie ze zdjęciem, wiadomością i lokalizacją"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Połączenie przychodzące z załącznikami"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Ważne połączenie przychodzące"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Ważne połączenie przychodzące ze zdjęciem"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Ważne połączenie przychodzące z wiadomością"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Ważne połączenie przychodzące z lokalizacją"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Ważne połączenie ze zdjęciem i wiadomością"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Ważne połączenie ze zdjęciem i lokalizacją"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Ważne połączenie z wiadomością i lokalizacją"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ważne połączenie przychodzące z załącznikami"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ważne połączenie przychodzące z załącznikami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Przychodzące połączenie służbowe"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Przychodzące połączenie przez Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Przychodzące połączenie służbowe przez Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-pt-rBR/strings.xml b/java/com/android/incallui/res/values-pt-rBR/strings.xml
index cfa8611af..29254dc68 100644
--- a/java/com/android/incallui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rBR/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com local"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e local"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e local"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e local"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada recebida importante com mensagem"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com local"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e local"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante com mensagem e local"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-pt-rPT/strings.xml b/java/com/android/incallui/res/values-pt-rPT/strings.xml
index c6ab2e3a0..7ec6bfece 100644
--- a/java/com/android/incallui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rPT/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada de trabalho por Wi-Fi em curso"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com localização"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e localização"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e localização"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e localização"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chama recebida importante com mensagem"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com localização"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e localização"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante c/ mensagem e localiz."</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"."</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-pt/strings.xml b/java/com/android/incallui/res/values-pt/strings.xml
index cfa8611af..29254dc68 100644
--- a/java/com/android/incallui/res/values-pt/strings.xml
+++ b/java/com/android/incallui/res/values-pt/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com local"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e local"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e local"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e local"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada recebida importante com mensagem"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com local"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e local"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante com mensagem e local"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-ro/strings.xml b/java/com/android/incallui/res/values-ro/strings.xml
index fd4c9a949..cd31f807b 100644
--- a/java/com/android/incallui/res/values-ro/strings.xml
+++ b/java/com/android/incallui/res/values-ro/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Apel de serviciu prin Wi-Fi în desfășurare"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"În așteptare"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Apel de intrare"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Apel primit cu fotografie"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Apel primit cu mesaj"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Apel primit cu locație"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Apel primit cu fotografie și mesaj"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Apel primit cu fotografie și locație"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Apel primit cu mesaj și locație"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Apel primit cu fotografie, mesaj și locație"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Apel primit cu atașamente"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Apel primit important"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Apel primit important cu fotografie"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Apel primit important cu mesaj"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Apel primit important cu locație"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Apel primit important cu fotografie și mesaj"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Apel primit important cu fotografie și locație"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Apel primit important cu mesaj și locație"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Apel primit important cu poză, mesaj și locație"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Apel primit important cu atașamente"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Apel de serviciu primit"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Apel prin Wi-Fi primit"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Apel de serviciu prin Wi-Fi primit"</string>
diff --git a/java/com/android/incallui/res/values-ru/strings.xml b/java/com/android/incallui/res/values-ru/strings.xml
index bf55fe92f..fd0773daa 100644
--- a/java/com/android/incallui/res/values-ru/strings.xml
+++ b/java/com/android/incallui/res/values-ru/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущий Wi-Fi-звонок (работа)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ждет ответа"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Входящий вызов"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящий вызов с фотографией"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Входящий вызов с сообщением"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Входящий вызов с геоданными"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Входящий вызов с фотографией и сообщением"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Входящий вызов с фотографией и геоданными"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Входящий вызов с сообщением и геоданными"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Входящий вызов с фото, сообщением и геоданными"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Входящий вызов с прикрепленными файлами"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важный входящий вызов"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важный входящий вызов с фотографией"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важный входящий вызов с сообщением"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важный входящий вызов с геоданными"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важный входящий вызов с фотографией и сообщением"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важный входящий вызов с фотографией и геоданными"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важный входящий вызов с сообщением и геоданными"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важный вызов с фото, сообщением и геоданными"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важный входящий вызов с прикрепленными файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящий звонок (работа)"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящий Wi-Fi-звонок"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящий Wi-Fi-звонок (работа)"</string>
diff --git a/java/com/android/incallui/res/values-si/strings.xml b/java/com/android/incallui/res/values-si/strings.xml
index 14f10dd78..1d24a5b9d 100644
--- a/java/com/android/incallui/res/values-si/strings.xml
+++ b/java/com/android/incallui/res/values-si/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"කරගෙන යන Wi-Fi කාර්යාල ඇමතුම"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"රඳවා ගනිමින්"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ඡායාරූපය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"පණිවිඩය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ස්ථානය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ඡායාරූපය සහ පණිවිඩය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ඡායාරූපය සහ ස්ථානය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ඇමුණුම් සමග එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ඡායාරූපය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"පණිවිඩය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ඡායාරූපය සහ පණිවිඩය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ඡායාරූපය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ඇමුණුම් සමග වැදගත් එන ඇමතුම"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"පැමිණෙන කාර්යාල ඇමතුම"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"පැමිණෙන Wi-Fi ඇමතුම"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"පැමිණෙන Wi-Fi කාර්යාල ඇමතුම"</string>
diff --git a/java/com/android/incallui/res/values-sk/strings.xml b/java/com/android/incallui/res/values-sk/strings.xml
index b203eb793..38326bc66 100644
--- a/java/com/android/incallui/res/values-sk/strings.xml
+++ b/java/com/android/incallui/res/values-sk/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Prebiehajúci pracovný hovor cez Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Podržaný hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Prichádzajúci hovor"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Prichádzajúci hovor s fotkou"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Prichádzajúci hovor so správou"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Prichádzajúci hovor s polohou"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Prichádzajúci hovor s fotkou a správou"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Prichádzajúci hovor s fotkou a polohou"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Prichádzajúci hovor so správou a polohou"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Prichádzajúci hovor s fotkou, správou a polohou"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Prichádzajúci hovor s prílohami"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Dôležitý prichádzajúci hovor"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Dôležitý prichádzajúci hovor s fotkou"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Dôležitý prichádzajúci hovor so správou"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Dôležitý prichádzajúci hovor s polohou"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Dôležitý prichádzajúci hovor s fotkou a správou"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Dôležitý prichádzajúci hovor s fotkou a polohou"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Dôležitý prichádzajúci hovor so správou a polohou"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Dôležitý prich. hovor s fotkou, správou a polohou"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Dôležitý prichádzajúci hovor s prílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Prichádzajúci pracovný hovor"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Prichádzajúci hovor prostredníctvom siete Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Prichádzajúci pracovný hovor cez Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-sl/strings.xml b/java/com/android/incallui/res/values-sl/strings.xml
index e91b52de6..0b360d396 100644
--- a/java/com/android/incallui/res/values-sl/strings.xml
+++ b/java/com/android/incallui/res/values-sl/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktivni delovni klic prek omrežja Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dohodni klic"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dohodni klic s fotografijo"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dohodni klic s sporočilom"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dohodni klic z lokacijo"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dohodni klic s fotografijo in sporočilom"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dohodni klic s fotografijo in lokacijo"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dohodni klic s sporočilom in lokacijo"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dohodni klic s fotografijo, sporočilom in lokacijo"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dohodni klic s prilogami"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Pomemben dohodni klic"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Pomemben dohodni klic s fotografijo"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Pomemben dohodni klic s sporočilom"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Pomemben dohodni klic z lokacijo"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Pomemben dohodni klic s fotografijo in sporočilom"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Pomemben dohodni klic s fotografijo in lokacijo"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Pomemben dohodni klic s sporočilom in lokacijo"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Pomemben klic s fotografijo, sporočilom, lokacijo"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Pomemben dohodni klic s prilogami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dohodni delovni klic"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dohodni klic prek Wi-Fi-ja"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dohodni delovni klic prek omrežja Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-sq/strings.xml b/java/com/android/incallui/res/values-sq/strings.xml
index 2e092cdd6..d1546530b 100644
--- a/java/com/android/incallui/res/values-sq/strings.xml
+++ b/java/com/android/incallui/res/values-sq/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Telefonatë pune dalëse përmes Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Në pritje"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Telefonatë hyrëse"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Telefonatë hyrëse me fotografi"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Telefonatë hyrëse me mesazh"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Telefonatë hyrëse me vendndodhjen"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Telefonatë hyrëse me fotografi dhe mesazh"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Telefonatë hyrëse me fotografi dhe vendndodhjen"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Telefonatë hyrëse me mesazh dhe vendndodhjen"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Telefonatë me fotografi, mesazh dhe vendndodhjen"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Telefonatë hyrëse me bashkëngjitje"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Telefonatë hyrëse e rëndësishme"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Telefonatë hyrëse e rëndësishme me fotografi"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Telefonatë hyrëse e rëndësishme me mesazh"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Telefonatë hyrëse e rëndësishme me vendndodhjen"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Telefonatë e rëndësishme me fotografi dhe mesazh"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Telefonatë e rëndësishme me foto dhe vendndodhjen"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Telefonatë e rëndësishme me mesazh e vendndodhjen"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tel. e rëndësishme me foto, mesazh e vendndodhjen"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Telefonatë hyrëse e rëndësishme me bashkëngjitje"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Telefonatë pune hyrëse"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Telefonatë hyrëse Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Telefonatë pune hyrëse përmes Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-sr/strings.xml b/java/com/android/incallui/res/values-sr/strings.xml
index fd3d4dd43..89b3e7def 100644
--- a/java/com/android/incallui/res/values-sr/strings.xml
+++ b/java/com/android/incallui/res/values-sr/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текући позив за Work преко Wi-Fi-ја"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекању"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Долазни позив"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Долазни позив са сликом"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Долазни позив са поруком"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Долазни позив са локацијом"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Долазни позив са сликом и поруком"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Долазни позив са сликом и локацијом"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Долазни позив са поруком и локацијом"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Долазни позив са сликом, поруком и локацијом"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Долазни позив са прилозима"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важан долазни позив"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важан долазни позив са сликом"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важан долазни позив са поруком"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важан долазни позив са локацијом"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важан долазни позив са сликом и поруком"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важан долазни позив са сликом и локацијом"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важан долазни позив са поруком и локацијом"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важан долазни позив са сликом, поруком и локацијом"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важан долазни позив са прилозима"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Долазни позив за Work"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Долазни Wi-Fi позив"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Долазни позив за Work преко Wi-Fi-ја"</string>
diff --git a/java/com/android/incallui/res/values-sv/strings.xml b/java/com/android/incallui/res/values-sv/strings.xml
index fa2a1a605..66d2732a8 100644
--- a/java/com/android/incallui/res/values-sv/strings.xml
+++ b/java/com/android/incallui/res/values-sv/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbsamtal via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkerat"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkommande samtal"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkommande samtal med foto"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkommande samtal med meddelande"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkommande samtal med plats"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkommande samtal med foto och meddelande"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkommande samtal med foto och plats"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkommande samtal med meddelande och plats"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkommande samtal med foto, meddelande och plats"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkommande samtal med bilagor"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktigt inkommande samtal"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktigt inkommande samtal med foto"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktigt inkommande samtal med meddelande"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktigt inkommande samtal med plats"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktigt inkommande samtal med foto och meddelande"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktigt inkommande samtal med foto och plats"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktigt inkommande samtal med meddelande och plats"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktigt inkommande samtal med foto, meddelande och plats"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktigt inkommande samtal med bilagor"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkommande jobbsamtal"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkommande Wi-Fi-samtal"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkommande jobbsamtal via Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-sw/strings.xml b/java/com/android/incallui/res/values-sw/strings.xml
index dc242c67f..914e22821 100644
--- a/java/com/android/incallui/res/values-sw/strings.xml
+++ b/java/com/android/incallui/res/values-sw/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Simu ya Wi-Fi ya kazi inayoendelea"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Inangoja"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Unapigiwa simu"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Simu inayoingia yenye picha"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Simu inayoingia yenye ujumbe"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Simu inayoingia yenye mahali"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Simu inayoingia yenye picha na ujumbe"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Simu inayoingia yenye picha na mahali"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Simu inayoingia yenye ujumbe na mahali"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Simu inayoingia yenye picha, ujumbe na mahali"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Simu inayoingia yenye viambatisho"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Simu muhimu inayoingia"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Simu muhimu inayoingia yenye picha"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Simu muhimu inayoingia yenye ujumbe"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Simu muhimu inayoingia yenye mahali"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Simu muhimu inayoingia yenye picha na ujumbe"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Simu muhimu inayoingia yenye picha na mahali"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Simu muhimu inayoingia yenye ujumbe na mahali"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Simu muhimu yenye picha, ujumbe na mahali"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Simu muhimu inayoingia yenye viambatisho"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Simu ya kazi inayoingia"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Simu ya Wi-Fi inayoingia"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Simu ya Wi-Fi ya kazi inayoingia"</string>
diff --git a/java/com/android/incallui/res/values-ta/strings.xml b/java/com/android/incallui/res/values-ta/strings.xml
index d97448eda..1eb9ce5bb 100644
--- a/java/com/android/incallui/res/values-ta/strings.xml
+++ b/java/com/android/incallui/res/values-ta/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"வெளிச்செல்லும் வைஃபை அழைப்பு (பணி)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"காத்திருப்பில்"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"படத்துடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"செய்தியுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"படம், செய்தியுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"படம், இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"படம், செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"இணைப்புகளுடன் உள்வரும் அழைப்பு"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"படத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"இருப்பிடத் தகவலுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"படம், செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"படம், இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"படம், செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"இணைப்புகளுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"உள்வரும் அழைப்பு (பணி)"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"உள்வரும் வைஃபை அழைப்பு"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"உள்வரும் வைஃபை அழைப்பு (பணி)"</string>
diff --git a/java/com/android/incallui/res/values-te/strings.xml b/java/com/android/incallui/res/values-te/strings.xml
index 1e3719cac..fc9723d01 100644
--- a/java/com/android/incallui/res/values-te/strings.xml
+++ b/java/com/android/incallui/res/values-te/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi కార్యాలయ కాల్ కొనసాగుతోంది"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"హోల్డ్‌లో ఉంది"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ఫోటోతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"సందేశంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ఫోటో మరియు సందేశంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ఫోటో మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ఫోటో, సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"జోడింపులతో ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ఫోటోతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ఫోటో మరియు సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ఫోటో మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"సందేశం మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ఫోటో, సందేశం, స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"జోడింపులతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ఇన్‌కమింగ్ కార్యాలయ కాల్"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi కాల్ వస్తోంది"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ఇన్‌కమింగ్ Wi-Fi కార్యాలయ కాల్"</string>
diff --git a/java/com/android/incallui/res/values-th/strings.xml b/java/com/android/incallui/res/values-th/strings.xml
index b40dcfd88..8fef8a696 100644
--- a/java/com/android/incallui/res/values-th/strings.xml
+++ b/java/com/android/incallui/res/values-th/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"กำลังอยู่ในสายจากที่ทำงานผ่าน Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"สายเรียกเข้า"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"สายเรียกเข้าพร้อมรูปภาพ"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"สายเรียกเข้าพร้อมข้อความ"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"สายเรียกเข้าพร้อมตำแหน่ง"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"สายเรียกเข้าพร้อมรูปภาพและข้อความ"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"สายเรียกเข้าพร้อมรูปภาพและตำแหน่ง"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"สายเรียกเข้าพร้อมข้อความและตำแหน่ง"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"สายเรียกเข้าพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"สายเรียกเข้าพร้อมไฟล์แนบ"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"สายเรียกเข้าที่สำคัญ"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"สายเรียกเข้าที่สำคัญพร้อมข้อความ"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"สายเรียกเข้าที่สำคัญพร้อมตำแหน่ง"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพและข้อความ"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพและตำแหน่ง"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"สายเรียกเข้าที่สำคัญพร้อมข้อความและตำแหน่ง"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"สายเรียกเข้าที่สำคัญพร้อมไฟล์แนบ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"มีสายเรียกเข้าจากที่ทำงาน"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"สายโทรเข้าผ่าน Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"มีสายเรียกเข้าจากที่ทำงานผ่าน Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-tl/strings.xml b/java/com/android/incallui/res/values-tl/strings.xml
index c6b11d0fd..725fc4838 100644
--- a/java/com/android/incallui/res/values-tl/strings.xml
+++ b/java/com/android/incallui/res/values-tl/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Kasalukuyang tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Papasok na tawag"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Papasok na tawag na may larawan"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Papasok na tawag na may mensahe"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Papasok na tawag na may lokasyon"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Papasok na tawag na may larawan at mensahe"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Papasok na tawag na may larawan at lokasyon"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Papasok na tawag na may mensahe at lokasyon"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Papasok na tawag na may larawan, mensahe, at lokasyon"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Papasok na tawag na may mga attachment"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Mahalagang papasok na tawag"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Mahalagang papasok na tawag na may larawan"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mahalagang papasok na tawag na may mensahe"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Mahalagang papasok na tawag na may lokasyon"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Mahalagang papasok na tawag na may larawan at mensahe"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Mahalagang papasok na tawag na may larawan at lokasyon"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mahalagang papasok na tawag na may mensahe at lokasyon"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mahalagang papasok na tawag na may larawan, mensahe, at lokasyon"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mahalagang papasok na tawag na may mga attachment"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Papasok na tawag sa trabaho"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Papasok na tawag sa Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Papasok na tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-tr/strings.xml b/java/com/android/incallui/res/values-tr/strings.xml
index a16935182..1d88d5af8 100644
--- a/java/com/android/incallui/res/values-tr/strings.xml
+++ b/java/com/android/incallui/res/values-tr/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Süren kablosuz iş çağrısı"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gelen çağrı"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Fotoğraf eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Mesaj eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Konum eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Fotoğraf ve mesaj eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Fotoğraf ve konum eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Mesaj ve konum eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Fotoğraf, mesaj ve konum eklenmiş gelen çağrı"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ek iliştirilmiş gelen çağrı"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Fotoğraf eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mesaj eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Konum eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Fotoğraf ve mesaj eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Fotoğraf ve konum eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mesaj ve konum eklenmiş önemli gelen çağrı"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fotoğraf, mesaj ve konum eklenmiş önemli çağrı"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ek iliştirilmiş önemli gelen çağrı"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gelen iş çağrısı"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gelen kablosuz çağrı"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gelen kablosuz iş çağrısı"</string>
diff --git a/java/com/android/incallui/res/values-uk/strings.xml b/java/com/android/incallui/res/values-uk/strings.xml
index f9105afec..09168001e 100644
--- a/java/com/android/incallui/res/values-uk/strings.xml
+++ b/java/com/android/incallui/res/values-uk/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Поточний дзвінок на робочий телефон через Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Очікує"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вхідний виклик"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Вхідний дзвінок із фото"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Вхідний дзвінок із повідомленням"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Вхідний дзвінок з указанням адреси"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Вхідний дзвінок із фото та повідомленням"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Вхідний дзвінок із фото й адресою"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Вхідний дзвінок з указанням адреси й повідомленням"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Вхідний дзвінок із фото, повідомленням й адресою"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Вхідний дзвінок із вкладеними файлами"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важливий вхідний дзвінок"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важливий вхідний дзвінок із фото"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важливий вхідний дзвінок із повідомленням"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важливий вхідний дзвінок з адресою"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важливий вхідний дзвінок із фото та повідомленням"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важливий вхідний дзвінок із фото й адресою"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важливий вхідний дзвінок з адресою й повідомленням"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важливий дзвінок із фото, повідомленням і адресою"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важливий вхідний дзвінок із вкладеними файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Вхідний дзвінок на робочий телефон"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Вхідний дзвінок через Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Вхідний дзвінок на робочий телефон через Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values-ur/strings.xml b/java/com/android/incallui/res/values-ur/strings.xml
index c7a11abf6..bf8c8e19c 100644
--- a/java/com/android/incallui/res/values-ur/strings.xml
+++ b/java/com/android/incallui/res/values-ur/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏کام سے متعلق جاری Wi-Fi کال"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ہولڈ پر"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"آنے والی کال"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تصویر کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"پیغام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"مقام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"تصویر اور پیغام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"تصویر اور مقام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"پیغام اور مقام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"تصویر، پیغام اور مقام کے ساتھ آنے والی کال"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"منسلکات کے ساتھ آنے والی کال"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"اہم آنے والی کال"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"تصویر کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"پیغام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"مقام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"تصویر اور پیغام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"تصویر اور مقام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تصویر، پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"منسلکات کے ساتھ آنے والی اہم کال"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"کام سے متعلق آنے والی کال"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏Wi-Fi کال آ رہی ہے"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏کام سے متعلق آنے والی Wi-Fi کال"</string>
diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index 585f983ac..2577e1947 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Xabarga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Joylashuv axborotiga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Surat va xabarga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Surat va joylash. axborotiga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Xabar va joylash. axborotiga ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Surat, xabar va joyl. axbor. ega kiruvchi chaqiruv"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Biriktirmalarga ega kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Suratga ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Xabarga ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Joylashuv axborotiga ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Surat va xabarga ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Surat va joy. axborot. ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Xabar va joy. axborot. ega muhim kiruvchi chaqiruv"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Biriktirmalarga ega muhim kiruvchi chaqiruv"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Kiruvchi ishchi qo‘ng‘irog‘i"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Kiruvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
diff --git a/java/com/android/incallui/res/values-vi/strings.xml b/java/com/android/incallui/res/values-vi/strings.xml
index 37ecd58c5..845c9e8dc 100644
--- a/java/com/android/incallui/res/values-vi/strings.xml
+++ b/java/com/android/incallui/res/values-vi/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Cuộc gọi đang diễn ra qua Wi-Fi về công việc"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Cuộc gọi đến"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Cuộc gọi đến có ảnh"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Cuộc gọi đến có tin nhắn"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Cuộc gọi đến có vị trí"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Cuộc gọi đến có ảnh và tin nhắn"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Cuộc gọi đến có ảnh và vị trí"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Cuộc gọi đến có tin nhắn và vị trí"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Cuộc gọi đến có ảnh, tin nhắn và vị trí"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Cuộc gọi đến có tệp đính kèm"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Cuộc gọi đến quan trọng"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Cuộc gọi đến quan trọng có ảnh"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Cuộc gọi đến quan trọng có tin nhắn"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Cuộc gọi đến quan trọng có vị trí"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Cuộc gọi đến quan trọng có ảnh và tin nhắn"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Cuộc gọi đến quan trọng có ảnh và vị trí"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Cuộc gọi đến quan trọng có tin nhắn và vị trí"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Cuộc gọi đến quan trọng có ảnh, tin nhắn và vị trí"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Cuộc gọi đến quan trọng có tệp đính kèm"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Cuộc gọi đến về công việc"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Cuộc gọi đến qua Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Cuộc gọi đến qua Wi-Fi về công việc"</string>
diff --git a/java/com/android/incallui/res/values-zh-rCN/strings.xml b/java/com/android/incallui/res/values-zh-rCN/strings.xml
index ceb54d8fd..7168254bf 100644
--- a/java/com/android/incallui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rCN/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"WLAN 工作通话进行中"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保持"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"来电"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含照片的来电"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"包含信息的来电"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"包含位置信息的来电"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"包含照片和信息的来电"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"包含照片和位置信息的来电"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"包含信息和位置信息的来电"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"包含照片、信息和位置信息的来电"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"包含附件的来电"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要来电"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"包含照片的重要来电"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"包含信息的重要来电"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"包含位置信息的重要来电"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"包含照片和信息的重要来电"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"包含照片和位置信息的重要来电"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"包含信息和位置信息的重要来电"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含照片、信息和位置信息的重要来电"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要来电"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作来电"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"WLAN 来电"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"WLAN 工作来电"</string>
diff --git a/java/com/android/incallui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/res/values-zh-rHK/strings.xml
index 1df42af1c..00fe6f385 100644
--- a/java/com/android/incallui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rHK/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"正在進行 Wi-Fi 工作通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留通話"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"附有相片的來電"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"附有訊息的來電"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"附有位置的來電"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"附有相片和訊息的來電"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"附有相片和位置的來電"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"附有訊息和位置的來電"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"附有相片、訊息和位置的來電"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"附有附件的來電"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"附有相片的重要來電"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"附有訊息的重要來電"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"附有位置的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"附有相片和訊息的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"附有相片和位置的重要來電"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"附有訊息和位置的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"附有相片、訊息和位置的重要來電"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"附有附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作來電"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 來電"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi 工作來電"</string>
diff --git a/java/com/android/incallui/res/values-zh-rTW/strings.xml b/java/com/android/incallui/res/values-zh-rTW/strings.xml
index 2aa43d5d9..c9f4748e5 100644
--- a/java/com/android/incallui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rTW/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"進行中的公司通話 (透過 Wi-Fi)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"通話保留"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含相片的來電"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"包含訊息的來電"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"包含位置資訊的來電"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"包含相片和訊息的來電"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"包含相片和位置資訊的來電"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"包含訊息和位置資訊的來電"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"包含相片、訊息和位置資訊的來電"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"包含附件的來電"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"包含相片的重要來電"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"包含訊息的重要來電"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"包含位置資訊的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"包含相片和訊息的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"包含相片和位置資訊的重要來電"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"包含訊息和位置資訊的重要來電"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含相片、訊息和位置資訊的重要來電"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"公司來電"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"撥入的 Wi-Fi 電話"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"公司來電 (透過 Wi-Fi)"</string>
diff --git a/java/com/android/incallui/res/values-zu/strings.xml b/java/com/android/incallui/res/values-zu/strings.xml
index baeeb8e09..7c5b1ab28 100644
--- a/java/com/android/incallui/res/values-zu/strings.xml
+++ b/java/com/android/incallui/res/values-zu/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ikholi yomsebenzi eqhubekayo ye-Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ibambile"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ikholi engenayo"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ikholi engenayo enesithombe"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Ikholi engenayo enomlayezo"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Ikholi engenayo enendawo"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Ikholi engenayo enesithombe nomlayezo"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Ikholi engenayo enesithombe nendawo"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Ikholi engenayo enomlayezo nendawo"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Ikholi engenayo enesithombe, umlayezo nendawo"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ikholi engenayo enokunamathiselwe kwi-imeyili"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Ikholi engenayo ebalulekile"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Ikholi engenayo ebalulekile enesithombe"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Ikholi engenayo ebalulekile enomlayezo"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Ikholi engenayo ebalulekile enendawo"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Ikholi engenayo ebalulekile enesithombe nomlayezo"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Ikholi engenayo ebalulekile enesithombe nendawo"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Ikholi engenayo ebalulekile enomlayezo nendawo"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ikholi engenayo ebalulekile enesithombe, umlayezo nendawo"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ikholi engenayo ebalulekile enokunamathiselwe kwi-imeyili"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ikholi engenayo yomsebenzi"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ikholi ye-Wi-Fi engenayo"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ikholi engenayo yomsebenzi ye-Wi-Fi"</string>
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index 0b95a9cc6..18d593091 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -86,6 +86,42 @@
   <string name="notification_on_hold">On hold</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
   <string name="notification_incoming_call">Incoming call</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] -->
+  <string name="notification_incoming_call_with_photo">Incoming call with photo</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] -->
+  <string name="notification_incoming_call_with_message">Incoming call with message</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] -->
+  <string name="notification_incoming_call_with_location">Incoming call with location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="notification_incoming_call_with_photo_message">Incoming call with photo and message</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="notification_incoming_call_with_photo_location">Incoming call with photo and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="notification_incoming_call_with_message_location">Incoming call with message and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="notification_incoming_call_with_photo_message_location">Incoming call with photo, message and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] -->
+  <string name="notification_incoming_call_attachments">Incoming call with attachments</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] -->
+  <string name="important_notification_incoming_call">Important incoming call</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". -->
+  <string name="important_notification_incoming_call_with_photo">Important incoming call with photo</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". -->
+  <string name="important_notification_incoming_call_with_message">Important incoming call with message</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". -->
+  <string name="important_notification_incoming_call_with_location">Important incoming call with location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="important_notification_incoming_call_with_photo_message">Important incoming call with photo and message</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="important_notification_incoming_call_with_photo_location">Important incoming call with photo and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="important_notification_incoming_call_with_message_location">Important incoming call with message and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." -->
+  <string name="important_notification_incoming_call_with_photo_message_location">Important incoming call with photo, message and location</string>
+  <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". -->
+  <string name="important_notification_incoming_call_attachments">Important incoming call with attachments</string>
+
+
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
   <string name="notification_incoming_work_call">Incoming work call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call,
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
index 0882781e7..431a178c2 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
@@ -40,7 +40,7 @@
     android:elevation="@dimen/answer_data_elevation"
     android:outlineProvider="background"
     android:adjustViewBounds="true"
-    android:scaleType="fitXY"/>
+    android:scaleType="fitCenter"/>
 
   <ProgressBar
     android:layout_width="wrap_content"
diff --git a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java b/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
index 291fce4a0..9e5ab3c5e 100644
--- a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
+++ b/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
@@ -43,9 +43,9 @@ public class CameraPermissionDialogFragment extends DialogFragment {
             new DialogInterface.OnClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which) {
-                VideoCallFragment fragment =
+                CameraPermissionDialogCallback fragment =
                     FragmentUtils.getParentUnsafe(
-                        CameraPermissionDialogFragment.this, VideoCallFragment.class);
+                        CameraPermissionDialogFragment.this, CameraPermissionDialogCallback.class);
                 fragment.onCameraPermissionGranted();
               }
             })
@@ -59,4 +59,9 @@ public class CameraPermissionDialogFragment extends DialogFragment {
             })
         .create();
   }
+
+  /** Callback for being granted camera permission. */
+  public interface CameraPermissionDialogCallback {
+    void onCameraPermissionGranted();
+  }
 }
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
index c969fb05a..a65274276 100644
--- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
@@ -19,7 +19,6 @@ package com.android.incallui.video.impl;
 import android.Manifest.permission;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.drawable.Animatable;
 import android.os.Bundle;
@@ -44,9 +43,8 @@ import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
@@ -67,6 +65,7 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
+import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -86,7 +85,8 @@ public class SurfaceViewVideoCallFragment extends Fragment
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener {
+        OnSystemUiVisibilityChangeListener,
+        CameraPermissionDialogCallback {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
@@ -112,13 +112,13 @@ public class SurfaceViewVideoCallFragment extends Fragment
   private TextView remoteVideoOff;
   private View mutePreviewOverlay;
   private View previewOffOverlay;
-  private ImageView previewOffBlurredImageView;
   private View controls;
   private View controlsContainer;
   private SurfaceView previewSurfaceView;
   private SurfaceView remoteSurfaceView;
   private View greenScreenBackgroundView;
   private View fullscreenBackgroundView;
+  private FrameLayout previewRoot;
   private boolean shouldShowRemote;
   private boolean shouldShowPreview;
   private boolean isInFullscreenMode;
@@ -132,7 +132,8 @@ public class SurfaceViewVideoCallFragment extends Fragment
         @Override
         public void run() {
           if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) {
-            LogUtil.i("VideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
+            LogUtil.i(
+                "SurfaceViewVideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
             checkCameraPermission();
           }
         }
@@ -150,7 +151,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    LogUtil.i("VideoCallFragment.onCreate", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onCreate", null);
 
     inCallButtonUiDelegate =
         FragmentUtils.getParent(this, InCallButtonUiDelegateFactory.class)
@@ -165,10 +166,13 @@ public class SurfaceViewVideoCallFragment extends Fragment
       int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     if (requestCode == CAMERA_PERMISSION_REQUEST_CODE) {
       if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-        LogUtil.i("VideoCallFragment.onRequestPermissionsResult", "Camera permission granted.");
+        LogUtil.i(
+            "SurfaceViewVideoCallFragment.onRequestPermissionsResult",
+            "Camera permission granted.");
         videoCallScreenDelegate.onCameraPermissionGranted();
       } else {
-        LogUtil.i("VideoCallFragment.onRequestPermissionsResult", "Camera permission denied.");
+        LogUtil.i(
+            "SurfaceViewVideoCallFragment.onRequestPermissionsResult", "Camera permission denied.");
       }
     }
     super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -178,7 +182,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
-    LogUtil.i("VideoCallFragment.onCreateView", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onCreateView", null);
 
     View view =
         layoutInflater.inflate(
@@ -201,8 +205,6 @@ public class SurfaceViewVideoCallFragment extends Fragment
     cameraOffButton = (CheckableImageButton) view.findViewById(R.id.videocall_mute_video);
     cameraOffButton.setOnCheckedChangeListener(this);
     previewOffOverlay = view.findViewById(R.id.videocall_video_preview_off_overlay);
-    previewOffBlurredImageView =
-        (ImageView) view.findViewById(R.id.videocall_preview_off_blurred_image_view);
     swapCameraButton = (ImageButton) view.findViewById(R.id.videocall_switch_video);
     swapCameraButton.setOnClickListener(this);
     view.findViewById(R.id.videocall_switch_controls)
@@ -215,7 +217,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
     endCallButton = view.findViewById(R.id.videocall_end_call);
     endCallButton.setOnClickListener(this);
     previewSurfaceView = (SurfaceView) view.findViewById(R.id.videocall_video_preview);
-    previewSurfaceView.setClipToOutline(true);
+    previewSurfaceView.setZOrderMediaOverlay(true);
     previewOffOverlay.setOnClickListener(
         new OnClickListener() {
           @Override
@@ -224,8 +226,20 @@ public class SurfaceViewVideoCallFragment extends Fragment
           }
         });
     remoteSurfaceView = (SurfaceView) view.findViewById(R.id.videocall_video_remote);
+    remoteSurfaceView.setOnClickListener(
+        surfaceView -> {
+          videoCallScreenDelegate.resetAutoFullscreenTimer();
+          if (isInFullscreenMode) {
+            updateFullscreenAndGreenScreenMode(
+                false /* shouldShowFullscreen */, false /* shouldShowGreenScreen */);
+          } else {
+            updateFullscreenAndGreenScreenMode(
+                true /* shouldShowFullscreen */, false /* shouldShowGreenScreen */);
+          }
+        });
     greenScreenBackgroundView = view.findViewById(R.id.videocall_green_screen_background);
     fullscreenBackgroundView = view.findViewById(R.id.videocall_fullscreen_background);
+    previewRoot = (FrameLayout) view.findViewById(R.id.videocall_preview_root);
 
     // We need the texture view size to be able to scale the remote video. At this point the view
     // layout won't be complete so add a layout listener.
@@ -234,7 +248,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
         new ViewTreeObserver.OnGlobalLayoutListener() {
           @Override
           public void onGlobalLayout() {
-            LogUtil.i("VideoCallFragment.onGlobalLayout", null);
+            LogUtil.i("SurfaceViewVideoCallFragment.onGlobalLayout", null);
             updateVideoOffViews();
             // Remove the listener so we don't continually re-layout.
             ViewTreeObserver observer = remoteSurfaceView.getViewTreeObserver();
@@ -250,7 +264,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onViewCreated(View view, @Nullable Bundle bundle) {
     super.onViewCreated(view, bundle);
-    LogUtil.i("VideoCallFragment.onViewCreated", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onViewCreated", null);
 
     inCallScreenDelegate =
         FragmentUtils.getParentUnsafe(this, InCallScreenDelegateFactory.class)
@@ -283,7 +297,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onDestroyView() {
     super.onDestroyView();
-    LogUtil.i("VideoCallFragment.onDestroyView", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onDestroyView", null);
     inCallButtonUiDelegate.onInCallButtonUiUnready();
     inCallScreenDelegate.onInCallScreenUnready();
   }
@@ -299,7 +313,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onStart() {
     super.onStart();
-    LogUtil.i("VideoCallFragment.onStart", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onStart", null);
     onVideoScreenStart();
   }
 
@@ -313,20 +327,20 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onResume() {
     super.onResume();
-    LogUtil.i("VideoCallFragment.onResume", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onResume", null);
     inCallScreenDelegate.onInCallScreenResumed();
   }
 
   @Override
   public void onPause() {
     super.onPause();
-    LogUtil.i("VideoCallFragment.onPause", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onPause", null);
   }
 
   @Override
   public void onStop() {
     super.onStop();
-    LogUtil.i("VideoCallFragment.onStop", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onStop", null);
     onVideoScreenStop();
   }
 
@@ -337,10 +351,10 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   private void exitFullscreenMode() {
-    LogUtil.i("VideoCallFragment.exitFullscreenMode", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.exitFullscreenMode", null);
 
     if (!getView().isAttachedToWindow()) {
-      LogUtil.i("VideoCallFragment.exitFullscreenMode", "not attached");
+      LogUtil.i("SurfaceViewVideoCallFragment.exitFullscreenMode", "not attached");
       return;
     }
 
@@ -486,9 +500,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   private View[] getAllPreviewRelatedViews() {
-    return new View[] {
-      previewSurfaceView, previewOffOverlay, previewOffBlurredImageView, mutePreviewOverlay,
-    };
+    return new View[] {previewRoot};
   }
 
   private int getOffsetTop(View view) {
@@ -516,7 +528,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   private void enterFullscreenMode() {
-    LogUtil.i("VideoCallFragment.enterFullscreenMode", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.enterFullscreenMode", null);
 
     hideSystemUI();
 
@@ -590,7 +602,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onClick(View v) {
     if (v == endCallButton) {
-      LogUtil.i("VideoCallFragment.onClick", "end call button clicked");
+      LogUtil.i("SurfaceViewVideoCallFragment.onClick", "end call button clicked");
       inCallButtonUiDelegate.onEndCallClicked();
       videoCallScreenDelegate.resetAutoFullscreenTimer();
     } else if (v == swapCameraButton) {
@@ -606,7 +618,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   public void onCheckedChanged(CheckableImageButton button, boolean isChecked) {
     if (button == cameraOffButton) {
       if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
-        LogUtil.i("VideoCallFragment.onCheckedChanged", "show camera permission dialog");
+        LogUtil.i("SurfaceViewVideoCallFragment.onCheckedChanged", "show camera permission dialog");
         checkCameraPermission();
       } else {
         inCallButtonUiDelegate.pauseVideoClicked(isChecked);
@@ -622,14 +634,23 @@ public class SurfaceViewVideoCallFragment extends Fragment
   public void showVideoViews(
       boolean shouldShowPreview, boolean shouldShowRemote, boolean isRemotelyHeld) {
     LogUtil.i(
-        "VideoCallFragment.showVideoViews",
+        "SurfaceViewVideoCallFragment.showVideoViews",
         "showPreview: %b, shouldShowRemote: %b",
         shouldShowPreview,
         shouldShowRemote);
+
+    if (this.shouldShowPreview == shouldShowPreview
+        && this.shouldShowRemote == shouldShowRemote
+        && this.isRemotelyHeld == isRemotelyHeld) {
+      return;
+    }
+
     this.shouldShowPreview = shouldShowPreview;
     this.shouldShowRemote = shouldShowRemote;
     this.isRemotelyHeld = isRemotelyHeld;
 
+    previewSurfaceView.setVisibility(shouldShowPreview ? View.VISIBLE : View.INVISIBLE);
+
     videoCallScreenDelegate.setSurfaceViews(previewSurfaceView, remoteSurfaceView);
     updateVideoOffViews();
   }
@@ -642,31 +663,33 @@ public class SurfaceViewVideoCallFragment extends Fragment
    */
   @Override
   public void onLocalVideoDimensionsChanged() {
-    LogUtil.i("VideoCallFragment.onLocalVideoDimensionsChanged", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onLocalVideoDimensionsChanged", null);
   }
 
   @Override
   public void onLocalVideoOrientationChanged() {
-    LogUtil.i("VideoCallFragment.onLocalVideoOrientationChanged", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onLocalVideoOrientationChanged", null);
   }
 
   /** Called when the remote video's dimensions change. */
   @Override
   public void onRemoteVideoDimensionsChanged() {
-    LogUtil.i("VideoCallFragment.onRemoteVideoDimensionsChanged", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onRemoteVideoDimensionsChanged", null);
   }
 
   @Override
   public void updateFullscreenAndGreenScreenMode(
       boolean shouldShowFullscreen, boolean shouldShowGreenScreen) {
     LogUtil.i(
-        "VideoCallFragment.updateFullscreenAndGreenScreenMode",
+        "SurfaceViewVideoCallFragment.updateFullscreenAndGreenScreenMode",
         "shouldShowFullscreen: %b, shouldShowGreenScreen: %b",
         shouldShowFullscreen,
         shouldShowGreenScreen);
 
     if (getActivity() == null) {
-      LogUtil.i("VideoCallFragment.updateFullscreenAndGreenScreenMode", "not attached to activity");
+      LogUtil.i(
+          "SurfaceViewVideoCallFragment.updateFullscreenAndGreenScreenMode",
+          "not attached to activity");
       return;
     }
 
@@ -678,7 +701,8 @@ public class SurfaceViewVideoCallFragment extends Fragment
         && shouldShowGreenScreen == isInGreenScreenMode
         && shouldShowFullscreen == isInFullscreenMode) {
       LogUtil.i(
-          "VideoCallFragment.updateFullscreenAndGreenScreenMode", "no change to screen modes");
+          "SurfaceViewVideoCallFragment.updateFullscreenAndGreenScreenMode",
+          "no change to screen modes");
       return;
     }
     hasInitializedScreenModes = true;
@@ -722,7 +746,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void showButton(@InCallButtonIds int buttonId, boolean show) {
     LogUtil.v(
-        "VideoCallFragment.showButton",
+        "SurfaceViewVideoCallFragment.showButton",
         "buttonId: %s, show: %b",
         InCallButtonIdsExtension.toString(buttonId),
         show);
@@ -742,7 +766,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void enableButton(@InCallButtonIds int buttonId, boolean enable) {
     LogUtil.v(
-        "VideoCallFragment.setEnabled",
+        "SurfaceViewVideoCallFragment.setEnabled",
         "buttonId: %s, enable: %b",
         InCallButtonIdsExtension.toString(buttonId),
         enable);
@@ -759,7 +783,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void setEnabled(boolean enabled) {
-    LogUtil.v("VideoCallFragment.setEnabled", "enabled: " + enabled);
+    LogUtil.v("SurfaceViewVideoCallFragment.setEnabled", "enabled: " + enabled);
     speakerButtonController.setEnabled(enabled);
     muteButton.setEnabled(enabled);
     cameraOffButton.setEnabled(enabled);
@@ -768,23 +792,25 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void setHold(boolean value) {
-    LogUtil.i("VideoCallFragment.setHold", "value: " + value);
+    LogUtil.i("SurfaceViewVideoCallFragment.setHold", "value: " + value);
   }
 
   @Override
   public void setCameraSwitched(boolean isBackFacingCamera) {
-    LogUtil.i("VideoCallFragment.setCameraSwitched", "isBackFacingCamera: " + isBackFacingCamera);
+    LogUtil.i(
+        "SurfaceViewVideoCallFragment.setCameraSwitched",
+        "isBackFacingCamera: " + isBackFacingCamera);
   }
 
   @Override
   public void setVideoPaused(boolean isPaused) {
-    LogUtil.i("VideoCallFragment.setVideoPaused", "isPaused: " + isPaused);
+    LogUtil.i("SurfaceViewVideoCallFragment.setVideoPaused", "isPaused: " + isPaused);
     cameraOffButton.setChecked(isPaused);
   }
 
   @Override
   public void setAudioState(CallAudioState audioState) {
-    LogUtil.i("VideoCallFragment.setAudioState", "audioState: " + audioState);
+    LogUtil.i("SurfaceViewVideoCallFragment.setAudioState", "audioState: " + audioState);
     speakerButtonController.setAudioState(audioState);
     muteButton.setChecked(audioState.isMuted());
     updateMutePreviewOverlayVisibility();
@@ -792,7 +818,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void updateButtonStates() {
-    LogUtil.i("VideoCallFragment.updateButtonState", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.updateButtonState", null);
     speakerButtonController.updateButtonState();
     switchOnHoldCallController.updateButtonState();
   }
@@ -807,26 +833,26 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void showAudioRouteSelector() {
-    LogUtil.i("VideoCallFragment.showAudioRouteSelector", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.showAudioRouteSelector", null);
     AudioRouteSelectorDialogFragment.newInstance(inCallButtonUiDelegate.getCurrentAudioState())
         .show(getChildFragmentManager(), null);
   }
 
   @Override
   public void onAudioRouteSelected(int audioRoute) {
-    LogUtil.i("VideoCallFragment.onAudioRouteSelected", "audioRoute: " + audioRoute);
+    LogUtil.i("SurfaceViewVideoCallFragment.onAudioRouteSelected", "audioRoute: " + audioRoute);
     inCallButtonUiDelegate.setAudioRoute(audioRoute);
   }
 
   @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
-    LogUtil.i("VideoCallFragment.setPrimary", primaryInfo.toString());
+    LogUtil.i("SurfaceViewVideoCallFragment.setPrimary", primaryInfo.toString());
     contactGridManager.setPrimary(primaryInfo);
   }
 
   @Override
   public void setSecondary(@NonNull SecondaryInfo secondaryInfo) {
-    LogUtil.i("VideoCallFragment.setSecondary", secondaryInfo.toString());
+    LogUtil.i("SurfaceViewVideoCallFragment.setSecondary", secondaryInfo.toString());
     if (!isAdded()) {
       savedSecondaryInfo = secondaryInfo;
       return;
@@ -851,23 +877,23 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void setCallState(@NonNull PrimaryCallState primaryCallState) {
-    LogUtil.i("VideoCallFragment.setCallState", primaryCallState.toString());
+    LogUtil.i("SurfaceViewVideoCallFragment.setCallState", primaryCallState.toString());
     contactGridManager.setCallState(primaryCallState);
   }
 
   @Override
   public void setEndCallButtonEnabled(boolean enabled, boolean animate) {
-    LogUtil.i("VideoCallFragment.setEndCallButtonEnabled", "enabled: " + enabled);
+    LogUtil.i("SurfaceViewVideoCallFragment.setEndCallButtonEnabled", "enabled: " + enabled);
   }
 
   @Override
   public void showManageConferenceCallButton(boolean visible) {
-    LogUtil.i("VideoCallFragment.showManageConferenceCallButton", "visible: " + visible);
+    LogUtil.i("SurfaceViewVideoCallFragment.showManageConferenceCallButton", "visible: " + visible);
   }
 
   @Override
   public boolean isManageConferenceVisible() {
-    LogUtil.i("VideoCallFragment.isManageConferenceVisible", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.isManageConferenceVisible", null);
     return false;
   }
 
@@ -878,17 +904,17 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void showNoteSentToast() {
-    LogUtil.i("VideoCallFragment.showNoteSentToast", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.showNoteSentToast", null);
   }
 
   @Override
   public void updateInCallScreenColors() {
-    LogUtil.i("VideoCallFragment.updateColors", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.updateColors", null);
   }
 
   @Override
   public void onInCallScreenDialpadVisibilityChange(boolean isShowing) {
-    LogUtil.i("VideoCallFragment.onInCallScreenDialpadVisibilityChange", null);
+    LogUtil.i("SurfaceViewVideoCallFragment.onInCallScreenDialpadVisibilityChange", null);
   }
 
   @Override
@@ -908,7 +934,8 @@ public class SurfaceViewVideoCallFragment extends Fragment
 
   @Override
   public void showLocationUi(Fragment locationUi) {
-    LogUtil.e("VideoCallFragment.showLocationUi", "Emergency video calling not supported");
+    LogUtil.e(
+        "SurfaceViewVideoCallFragment.showLocationUi", "Emergency video calling not supported");
     // Do nothing
   }
 
@@ -919,47 +946,17 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   private void enterGreenScreenMode() {
-    LogUtil.i("VideoCallFragment.enterGreenScreenMode", null);
-    RelativeLayout.LayoutParams params =
-        new RelativeLayout.LayoutParams(
-            RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
-    params.addRule(RelativeLayout.ALIGN_PARENT_START);
-    params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-    previewSurfaceView.setLayoutParams(params);
-    previewSurfaceView.setOutlineProvider(null);
+    LogUtil.i("SurfaceViewVideoCallFragment.enterGreenScreenMode", null);
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(true);
     updateMutePreviewOverlayVisibility();
-
-    previewOffBlurredImageView.setLayoutParams(params);
-    previewOffBlurredImageView.setOutlineProvider(null);
-    previewOffBlurredImageView.setClipToOutline(false);
   }
 
   private void exitGreenScreenMode() {
-    LogUtil.i("VideoCallFragment.exitGreenScreenMode", null);
-    Resources resources = getResources();
-    RelativeLayout.LayoutParams params =
-        new RelativeLayout.LayoutParams(
-            (int) resources.getDimension(R.dimen.videocall_preview_width),
-            (int) resources.getDimension(R.dimen.videocall_preview_height));
-    params.setMargins(
-        0, 0, 0, (int) resources.getDimension(R.dimen.videocall_preview_margin_bottom));
-    if (isLandscape()) {
-      params.addRule(RelativeLayout.ALIGN_PARENT_END);
-      params.setMarginEnd((int) resources.getDimension(R.dimen.videocall_preview_margin_end));
-    } else {
-      params.addRule(RelativeLayout.ALIGN_PARENT_START);
-      params.setMarginStart((int) resources.getDimension(R.dimen.videocall_preview_margin_start));
-    }
-    params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-    previewSurfaceView.setLayoutParams(params);
+    LogUtil.i("SurfaceViewVideoCallFragment.exitGreenScreenMode", null);
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(false);
     updateMutePreviewOverlayVisibility();
-
-    previewOffBlurredImageView.setLayoutParams(params);
-    previewOffBlurredImageView.setClipToOutline(true);
   }
 
   private void updateVideoOffViews() {
@@ -1056,9 +1053,17 @@ public class SurfaceViewVideoCallFragment extends Fragment
   public void onSystemUiVisibilityChange(int visibility) {
     boolean navBarVisible = (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
     videoCallScreenDelegate.onSystemUiVisibilityChange(navBarVisible);
+    if (navBarVisible) {
+      updateFullscreenAndGreenScreenMode(
+          false /* shouldShowFullscreen */, false /* shouldShowGreenScreen */);
+    } else {
+      updateFullscreenAndGreenScreenMode(
+          true /* shouldShowFullscreen */, false /* shouldShowGreenScreen */);
+    }
   }
 
-  protected void onCameraPermissionGranted() {
+  @Override
+  public void onCameraPermissionGranted() {
     videoCallScreenDelegate.onCameraPermissionGranted();
   }
 
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index e2850ccdf..96059375f 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -75,6 +75,7 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
+import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -84,6 +85,7 @@ import com.android.incallui.videosurface.protocol.VideoSurfaceTexture;
 import com.android.incallui.videotech.utils.VideoUtils;
 
 /** Contains UI elements for a video call. */
+// LINT.IfChange
 public class VideoCallFragment extends Fragment
     implements InCallScreen,
         InCallButtonUi,
@@ -91,7 +93,8 @@ public class VideoCallFragment extends Fragment
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener {
+        OnSystemUiVisibilityChangeListener,
+        CameraPermissionDialogCallback {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
@@ -1221,7 +1224,8 @@ public class VideoCallFragment extends Fragment
     videoCallScreenDelegate.onSystemUiVisibilityChange(navBarVisible);
   }
 
-  protected void onCameraPermissionGranted() {
+  @Override
+  public void onCameraPermissionGranted() {
     videoCallScreenDelegate.onCameraPermissionGranted();
   }
 
@@ -1242,3 +1246,4 @@ public class VideoCallFragment extends Fragment
     }
   }
 }
+//LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java)
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml
index 45a9c3392..4cafd68c6 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@android:color/black">
+  android:background="@android:color/black"
+  android:keepScreenOn="true">
 
   <SurfaceView
     android:id="@+id/videocall_video_remote"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentTop="true"
     android:importantForAccessibility="no"/>
 
-  <ImageView
-    android:id="@+id/videocall_remote_off_blurred_image_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentTop="true"
-    android:scaleType="fitCenter"/>
-
   <TextView
     android:gravity="center"
     android:id="@+id/videocall_remote_video_off"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
+    android:layout_gravity="center"
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
@@ -40,63 +31,54 @@
     android:id="@+id/videocall_fullscreen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
     android:background="@color/videocall_overlay_background_color"/>
 
-  <SurfaceView
-    android:id="@+id/videocall_video_preview"
+  <FrameLayout
+    android:id="@+id/videocall_preview_root"
     android:layout_width="@dimen/videocall_preview_width"
     android:layout_height="@dimen/videocall_preview_height"
+    android:layout_marginBottom="@dimen/videocall_preview_margin_bottom"
     android:layout_marginEnd="@dimen/videocall_preview_margin_end"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true"
-    android:importantForAccessibility="no"/>
+    android:background="@android:color/black"
+    android:layout_gravity="bottom|end">
 
-  <ImageView
-    android:id="@+id/videocall_preview_off_blurred_image_view"
-    android:layout_width="@dimen/videocall_preview_width"
-    android:layout_height="@dimen/videocall_preview_height"
-    android:layout_marginEnd="@dimen/videocall_preview_margin_end"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true"
-    android:scaleType="center"/>
+    <SurfaceView
+      android:id="@+id/videocall_video_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:importantForAccessibility="no"/>
+
+    <ImageView
+      android:id="@+id/videocall_video_preview_off_overlay"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:scaleType="center"
+      android:src="@drawable/quantum_ic_videocam_off_white_36"
+      android:visibility="gone"
+      android:importantForAccessibility="no"
+      tools:visibility="visible"/>
+
+    <ImageView
+      android:id="@+id/videocall_video_preview_mute_overlay"
+      android:layout_width="32dp"
+      android:layout_height="32dp"
+      android:layout_gravity="center"
+      android:background="@drawable/videocall_background_circle_white"
+      android:contentDescription="@string/incall_content_description_muted"
+      android:scaleType="center"
+      android:src="@drawable/quantum_ic_mic_off_black_24"
+      android:visibility="gone"
+      tools:visibility="visible"/>
+
+  </FrameLayout>
 
   <View
     android:id="@+id/videocall_green_screen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
     android:background="@color/videocall_overlay_background_color"/>
 
-  <ImageView
-    android:id="@+id/videocall_video_preview_off_overlay"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignBottom="@+id/videocall_video_preview"
-    android:layout_alignLeft="@+id/videocall_video_preview"
-    android:layout_alignRight="@+id/videocall_video_preview"
-    android:layout_alignTop="@+id/videocall_video_preview"
-    android:scaleType="center"
-    android:src="@drawable/quantum_ic_videocam_off_white_36"
-    android:visibility="gone"
-    android:importantForAccessibility="no"
-    tools:visibility="visible"/>
-
-  <ImageView
-    android:id="@+id/videocall_video_preview_mute_overlay"
-    android:layout_width="32dp"
-    android:layout_height="32dp"
-    android:layout_alignBottom="@+id/videocall_video_preview"
-    android:layout_alignRight="@+id/videocall_video_preview"
-    android:background="@drawable/videocall_background_circle_white"
-    android:contentDescription="@string/incall_content_description_muted"
-    android:scaleType="center"
-    android:src="@drawable/quantum_ic_mic_off_black_24"
-    android:visibility="gone"
-    tools:visibility="visible"/>
-
   <include
     layout="@layout/videocall_controls_land"
     android:layout_width="match_parent"
@@ -108,4 +90,4 @@
     android:layout_height="wrap_content"
     android:layout_alignParentTop="true"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
index 1b7a9301a..fa4aaef1c 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
@@ -1,33 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@android:color/black"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:keepScreenOn="true">
 
   <SurfaceView
     android:id="@+id/videocall_video_remote"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentTop="true"
     android:importantForAccessibility="no"/>
 
-  <ImageView
-    android:id="@+id/videocall_remote_off_blurred_image_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentTop="true"
-    android:scaleType="fitCenter"/>
-
   <TextView
     android:gravity="center"
     android:id="@+id/videocall_remote_video_off"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
+    android:layout_gravity="center"
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
@@ -42,69 +33,57 @@
     android:id="@+id/videocall_fullscreen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
     android:background="@color/videocall_overlay_background_color"
     tools:visibility="gone"/>
 
-  <SurfaceView
-    android:id="@+id/videocall_video_preview"
+  <FrameLayout
+    android:id="@+id/videocall_preview_root"
     android:layout_width="@dimen/videocall_preview_width"
     android:layout_height="@dimen/videocall_preview_height"
     android:layout_marginBottom="@dimen/videocall_preview_margin_bottom"
     android:layout_marginStart="@dimen/videocall_preview_margin_start"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
-    android:importantForAccessibility="no"/>
+    android:background="@android:color/black"
+    android:layout_gravity="bottom|start">
 
-  <ImageView
-    android:id="@+id/videocall_preview_off_blurred_image_view"
-    android:layout_width="@dimen/videocall_preview_width"
-    android:layout_height="@dimen/videocall_preview_height"
-    android:layout_marginBottom="@dimen/videocall_preview_margin_bottom"
-    android:layout_marginStart="@dimen/videocall_preview_margin_start"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
-    android:scaleType="center"/>
+    <SurfaceView
+      android:id="@+id/videocall_video_preview"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:importantForAccessibility="no"/>
+
+    <ImageView
+      android:id="@+id/videocall_video_preview_off_overlay"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:scaleType="center"
+      android:src="@drawable/quantum_ic_videocam_off_white_24"
+      android:tint="@color/videocall_camera_off_tint"
+      android:tintMode="src_in"
+      android:visibility="gone"
+      android:importantForAccessibility="no"
+      tools:visibility="visible"/>
+
+    <ImageView
+      android:id="@+id/videocall_video_preview_mute_overlay"
+      android:layout_width="32dp"
+      android:layout_height="32dp"
+      android:layout_gravity="center"
+      android:background="@drawable/videocall_background_circle_white"
+      android:contentDescription="@string/incall_content_description_muted"
+      android:scaleType="center"
+      android:src="@drawable/quantum_ic_mic_off_black_24"
+      android:visibility="gone"
+      tools:visibility="visible"/>
+  </FrameLayout>
 
   <View
     android:id="@+id/videocall_green_screen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentStart="true"
     android:background="@color/videocall_overlay_background_color"
     tools:visibility="gone"/>
 
-  <ImageView
-    android:id="@+id/videocall_video_preview_off_overlay"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignBottom="@+id/videocall_video_preview"
-    android:layout_alignLeft="@+id/videocall_video_preview"
-    android:layout_alignRight="@+id/videocall_video_preview"
-    android:layout_alignTop="@+id/videocall_video_preview"
-    android:scaleType="center"
-    android:src="@drawable/quantum_ic_videocam_off_white_24"
-    android:tint="@color/videocall_camera_off_tint"
-    android:tintMode="src_in"
-    android:visibility="gone"
-    android:importantForAccessibility="no"
-    tools:visibility="visible"/>
-
-  <ImageView
-    android:id="@+id/videocall_video_preview_mute_overlay"
-    android:layout_width="32dp"
-    android:layout_height="32dp"
-    android:layout_alignBottom="@+id/videocall_video_preview"
-    android:layout_alignRight="@+id/videocall_video_preview"
-    android:background="@drawable/videocall_background_circle_white"
-    android:contentDescription="@string/incall_content_description_muted"
-    android:scaleType="center"
-    android:src="@drawable/quantum_ic_mic_off_black_24"
-    android:visibility="gone"
-    tools:visibility="visible"/>
-
   <include
     layout="@layout/videocall_controls"
     android:layout_width="match_parent"
@@ -114,6 +93,6 @@
     android:id="@+id/videocall_on_hold_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_alignParentTop="true"/>
+    android:layout_gravity="top"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/java/com/android/incallui/video/protocol/AndroidManifest.xml b/java/com/android/incallui/video/protocol/AndroidManifest.xml
new file mode 100644
index 000000000..3a1dfb7a9
--- /dev/null
+++ b/java/com/android/incallui/video/protocol/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.incallui.video.protocol">
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="25"/>
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values/config.xml b/java/com/android/incallui/video/protocol/res/values/config.xml
index 0f3c983b7..0f3c983b7 100644
--- a/java/com/android/incallui/res/values/config.xml
+++ b/java/com/android/incallui/video/protocol/res/values/config.xml
diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java
index 5ecdc1d56..39998ad4c 100644
--- a/java/com/android/incallui/videotech/VideoTech.java
+++ b/java/com/android/incallui/videotech/VideoTech.java
@@ -24,7 +24,7 @@ import com.android.incallui.videotech.utils.SessionModificationState;
 /** Video calling interface. */
 public interface VideoTech {
 
-  boolean isAvailable();
+  boolean isAvailable(Context context);
 
   boolean isTransmittingOrReceiving();
 
@@ -39,7 +39,7 @@ public interface VideoTech {
   VideoCallScreenDelegate createVideoCallScreenDelegate(
       Context context, VideoCallScreen videoCallScreen);
 
-  void onCallStateChanged(int newState);
+  void onCallStateChanged(Context context, int newState);
 
   @SessionModificationState
   int getSessionModificationState();
diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
index 58c680935..d0a111d62 100644
--- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
+++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
@@ -27,7 +27,7 @@ import com.android.incallui.videotech.utils.SessionModificationState;
 public class EmptyVideoTech implements VideoTech {
 
   @Override
-  public boolean isAvailable() {
+  public boolean isAvailable(Context context) {
     return false;
   }
 
@@ -53,7 +53,7 @@ public class EmptyVideoTech implements VideoTech {
   }
 
   @Override
-  public void onCallStateChanged(int newState) {}
+  public void onCallStateChanged(Context context, int newState) {}
 
   @Override
   public int getSessionModificationState() {
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index 8c2ca151a..66a7af58a 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -43,7 +43,7 @@ public class ImsVideoTech implements VideoTech {
   }
 
   @Override
-  public boolean isAvailable() {
+  public boolean isAvailable(Context context) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
       return false;
     }
@@ -81,8 +81,8 @@ public class ImsVideoTech implements VideoTech {
   }
 
   @Override
-  public void onCallStateChanged(int newState) {
-    if (!isAvailable()) {
+  public void onCallStateChanged(Context context, int newState) {
+    if (!isAvailable(context)) {
       return;
     }
 
diff --git a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
new file mode 100644
index 000000000..e49d0b84d
--- /dev/null
+++ b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.videotech.lightbringer;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.telecom.Call;
+import com.android.dialer.common.Assert;
+import com.android.dialer.lightbringer.Lightbringer;
+import com.android.dialer.lightbringer.LightbringerListener;
+import com.android.incallui.video.protocol.VideoCallScreen;
+import com.android.incallui.video.protocol.VideoCallScreenDelegate;
+import com.android.incallui.videotech.VideoTech;
+import com.android.incallui.videotech.utils.SessionModificationState;
+
+public class LightbringerTech implements VideoTech, LightbringerListener {
+  private final Lightbringer lightbringer;
+  private final VideoTechListener listener;
+  private final String callingNumber;
+  private int callState = Call.STATE_NEW;
+
+  public LightbringerTech(
+      @NonNull Lightbringer lightbringer,
+      @NonNull VideoTechListener listener,
+      @NonNull String callingNumber) {
+    this.lightbringer = Assert.isNotNull(lightbringer);
+    this.listener = Assert.isNotNull(listener);
+    this.callingNumber = Assert.isNotNull(callingNumber);
+
+    lightbringer.registerListener(this);
+  }
+
+  @Override
+  public boolean isAvailable(Context context) {
+    return callState == Call.STATE_ACTIVE && lightbringer.isReachable(context, callingNumber);
+  }
+
+  @Override
+  public boolean isTransmittingOrReceiving() {
+    return false;
+  }
+
+  @Override
+  public boolean isSelfManagedCamera() {
+    return false;
+  }
+
+  @Override
+  public boolean shouldUseSurfaceView() {
+    return false;
+  }
+
+  @Override
+  public VideoCallScreenDelegate createVideoCallScreenDelegate(
+      Context context, VideoCallScreen videoCallScreen) {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void onCallStateChanged(Context context, int newState) {
+    if (newState == Call.STATE_DISCONNECTING) {
+      lightbringer.unregisterListener(this);
+    }
+
+    callState = newState;
+  }
+
+  @Override
+  public int getSessionModificationState() {
+    return SessionModificationState.NO_REQUEST;
+  }
+
+  @Override
+  public void upgradeToVideo() {
+    // TODO: upgrade to a video call
+  }
+
+  @Override
+  public void acceptVideoRequest() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void acceptVideoRequestAsAudio() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void declineVideoRequest() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public boolean isTransmitting() {
+    return false;
+  }
+
+  @Override
+  public void stopTransmission() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void resumeTransmission() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void pause() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void unpause() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void setCamera(String cameraId) {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void setDeviceOrientation(int rotation) {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public void onLightbringerStateChanged() {
+    listener.onVideoTechStateChanged();
+  }
+}