am 93f770b5: Merge "Fix bug where we could get stuck repeatedly launching an activity."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '93f770b59fa1bd0f2a5c18fcfaffd2a1fc54f585':
  Fix bug where we could get stuck repeatedly launching an activity.