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

Change-Id: I3a826482fb747965dcc61e997b60bf78d0686967