Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down....

am: ea600f9a12

Change-Id: I1b43aabc35b45558c90750cab7314b63ae8d4b60

diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge

diff --cc services/core/java/com/android/server/am/UserController.java
Simple merge

diff --cc services/core/java/com/android/server/pm/UserManagerService.java
Simple merge