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

Change-Id: Id9ac53e323c1439bbd38746a03e4e00aaf4232bf