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