Make sure a "Cancel" is honored

When the user refuses to set up a lockscreen password, pressing Cancel
wasn't honored the first time because onResume was still called after
onActivityResult. Instead set the state in onActivityResult and call
finish in onResume.

Bug: 13962060
Change-Id: I439592b2236261fa683484cd5c3ba26795aece47
Merge "Make sure a "Cancel" is honored"