[automerger skipped] Fix ActivityNotFoundException am: 97bff3903d -s ours am: 23930da853 -s ours

am skip reason: Change-Id I48bb7618ee9f97597f79fd124aca1f36bcba9f07 with SHA-1 97bff3903d is in history

Change-Id: I220800175cc461bad6a9dc0b005e721221a06872