[automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours
am skip reason: subject contains skip directive

Change-Id: I518408b1f14b392f0b265506e50504d5f0a18d96