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

Change-Id: I3e4bb22f6188899b46db3270b4c4adfefdd36378