Merge "Merge "Revert "Add extra debug to capture system state"" into qt-dev...
Merge "Merge "Revert "Add extra debug to capture system state"" into qt-dev am: 3abd182c am: 59b4460b" into qt-r1-dev-plus-aosp
am: 24aafdc8
Change-Id: Ic96f8d3b354095e7c10592ebd4ab0c9c72ecabaf