[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys" am: b829ad7b17 -s ours am: 45233be2cb -s ours
am: 11631e7fa9 -s ours
am skip reason: subject contains skip directive

Change-Id: I74742bab1a9ee14eeae93ad449a6ee74a904e7e5