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

Change-Id: I6d455307c27fa30090357d8d4fdb589ebfcfeaff