Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev