[automerger skipped] Merge "WinScope: Show IME windows" am: 38379147fa am: 1ae22e2952 -s ours
am: e78dce7aee -s ours
am skip reason: change_id If69e1bc340c0c79a5fb07385cc6921dd093e8fc2 with SHA1 97c5b512a3 is in history

Change-Id: Iebf20a9d9d80d9231c426590672da2f7a4cf4b11