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

Change-Id: I8f404d39d507fda1ae7a1f22ba2a81a59d3f378c