Merge "Merge "Separate out sysui state updating" into qt-r1-dev am: c7ce38df" into qt-r1-dev-plus-aosp am: 09ed3f9e Change-Id: I73e6b3f7e728c6987eb8b6aebe9ff91e9bd02b2e