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

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

Change-Id: Ia194f35f52829adc6efd44830618f8901277293c