Merge "Fix KeyguardSliceView leak" into rvc-dev am: 68a6d8263c am: 7decd10193

Change-Id: Ia2e8a5c1b6634c8f861bd8b9f1192890acd9f63f