Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...

* changes:
  Automated g4 rollback of changelist 172154863.
  Take into account special dialable characters when grouping calls in the call log UI.
  Move more Video Share stuff to third_party
  Fix NPE in TelecomAdapter.stopForegroundNotification().
  wrapping %s in in <xliff:g> </xliff:g> tags to prevent translation
  Check AD eligibility before utilizing the feature.

1 files changed, 7 insertions, 3 deletions

diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index 0c0bbd473..d48ab68c2 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -185,8 +185,12 @@ public class TelecomAdapter implements InCallServiceListener {
    * Stop a started foreground notification. This does not stop {@code mInCallService} from running.
    */
   public void stopForegroundNotification() {
-    Assert.isNotNull(
-        mInCallService, "No inCallService available for stopping foreground notification");
-    mInCallService.stopForeground(true /*removeNotification*/);
+    if (mInCallService != null) {
+      mInCallService.stopForeground(true /*removeNotification*/);
+    } else {
+      LogUtil.e(
+          "TelecomAdapter.stopForegroundNotification",
+          "no inCallService available for stopping foreground notification");
+    }
   }
 }