Fix a NPE in confirm lock screen. am: 8b2baed2be
am: da856402f4

Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059