Merge "Add IActivityManager.stopUserWithDelayedLocking"