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

Change-Id: I361d198327aa38d0d238f713bc0ff2998579d92f