Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df0f" into qt-r1-dev-plus-aosp am: 09ed3f9ea4
am: 9167ffb6c0

Change-Id: Ia295278a5c4191c9b9311b13ba852fb5cb6f0dea