Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev