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