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

Change-Id: I71edd61462c4f7b276a207d7efca6a5f82bb0a3e