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

Change-Id: Ie9a42c1358284f6c94fd1bc1a1afa5b11a08385f