[automerger skipped] Merge "WinScope: Properly show child windows." am: acf69cc766
am: d63def531c -s ours
am skip reason: change_id I188bb2c327bc61c309f7e3e3746f0af4241a94a9 with SHA1 45094b9c03 is in history

Change-Id: I742f9aca94ad66899c92f2a9d4306f16fc9576dd