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

Change-Id: I1c0c83648e95e07e9dc6f7bce5cd16447a6c4f0e