Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df...
Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df am: 5df62af9" into qt-qpr1-dev-plus-aosp
am: aaecb657
Change-Id: If34cc34acb1116f4d94f9ab50da2d2bbe1f2be22