Fix mute toggle behavior in Volume dialog.

Adjust some padding and alignment.

Bug: 5128528

Fix highlighted entry when using Battery shortcut.

Bug: 5099767
Change-Id: I830dbb40b0b8a6448d33b2be2c36b9b80ff14bc4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a99eb66..35dd268 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1100,7 +1100,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
+                android:resource="@id/battery_settings" />
         </activity>
 
         <activity