[automerger skipped] Fix ActivityNotFoundException am: 97bff3903d am: 9bc0665611 -s ours

am skip reason: Change-Id I48bb7618ee9f97597f79fd124aca1f36bcba9f07 with SHA-1 2e3dc01b70 is in history

Change-Id: I081c78ef8a22fd0f4d4f9b2dd57796532076c791