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

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

Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace