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

Change-Id: I5c104382b7056cc68bec5069f3faeb38f50f61bd