Revert "Add permissions CAR_CONTROL_AUDIO_SETTINGS and MEDIA_CON..."

Revert "Adopt shell permission to pass tests in signed build"

Revert submission 13065916-159367295

Reason for revert: Causes boot loop b/173532101
Reverted Changes:
I6670fb546:Add permissions CAR_CONTROL_AUDIO_SETTINGS and MED...
I975b9cff3:Adopt shell permission to pass tests in signed bui...

Bug: 173532101
Change-Id: I4641490d8a601162dc5bddfbb8efc4f4dff746f8
diff --git a/packages/CarShell/AndroidManifest.xml b/packages/CarShell/AndroidManifest.xml
index d016f74..c947a59 100644
--- a/packages/CarShell/AndroidManifest.xml
+++ b/packages/CarShell/AndroidManifest.xml
@@ -25,10 +25,6 @@
     <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
     <!-- Permission required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
     <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
-    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
-    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS" />
-    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
-    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
     <!-- Permissions required for ATS tests - AtsDeviceInfo -->
     <uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS" />
 </manifest>