Merge \"Merge \\\"Don\\\'t allow showing an activity if user is stopping or shutting down.\\\" into nyc-dev am: 2058553b8d am: f5cf319dc9\" into nyc-mr1-dev-plus-aosp
am: 7c6dbddce6

Change-Id: I39d4fc3fd95704b75162ad414980a3ba1c7e2ee0