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

Change-Id: I639ac2468369618cd4ba85d14d52e4811443f0ee