Merge "Revert "Add LogBuffers to KeyguardViewMediator""