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

Change-Id: I5abe2a760a71d10b8e0c6cb41d2563260a1ce118