Putting battery and status icons of shade header in one container

It's just rearranging the views and shouldn't introduce any visual changes.
This is first step of implementing hover states for them - they should behave as one unit in that case so it makes sense to have them in one container.

Bug: 249859409
Test: CombinedShadeHeaderConstraintsTest
Test: check motion when switching between QQS and QS and split shade behaviour

Change-Id: I3781c265c7fced21fc4d9554fd4c5f3b003a7924