Merge "GuidedStepFragment: Fix focus bug when cancel IME am: 71afae9a0c am: 0ae4e0a355" into nyc-mr1-dev-plus-aosp