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

Change-Id: I4b2369ac9059711f20078a4dccafb245a39fbd0b