Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dcf9 am: ce1220b912

Change-Id: I3a826482fb747965dcc61e997b60bf78d0686967

telephony/java/android/telephony/TelephonyManager.java

@@ -13098,7 +13098,9 @@ public class TelephonyManager {
                 service.userActivity();
             }
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            // one-way notification, if telephony is not available, it is okay to not throw
+            // exception here.
+            Log.w(TAG, "notifyUserActivity exception: " + e.getMessage());
         }
     }