Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
  Only resuming starting dontWaitForPause activity once

Change-Id: I5cc6a322d6c3cdd9bd28ea4a996fe960b1cefd81