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

Change-Id: I65055dd607613c5cddb3300552c89e86ef13bb20