Merge "Fix KeyguardSliceView leak" into rvc-dev am: 68a6d826 am: 7decd101 am: 5ef5f7a0 am: bfc7840e Change-Id: I361d198327aa38d0d238f713bc0ff2998579d92f