Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev...
Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f8" into nyc-mr1-dev am: 75179ada" into nyc-mr1-dev-plus-aosp
am: c2bef7c6
* commit 'c2bef7c6':
Make sure to pause activity before stopping
Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6