Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am: fd45210510

Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c