Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24
Change-Id: Ia2fe4cd03ccf69ff9508a559d2c196c177ec1100
This commit is contained in: