Fix auto rotation/battery tile long press [2/2]

Change-Id: Idca269a4cd702060ca7eb9223ed7f1b055bb3a69
Merge remote-tracking branch 'upstream/du44' into du44