[automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 0596cec192
Change-Id: Ic30715c62ba0207311413e0489e9cd9a13cb9629
This commit is contained in: