Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main

api/Android.bp

@@ -83,7 +83,6 @@ combined_apis {
         "framework-configinfrastructure",
         "framework-connectivity",
         "framework-connectivity-t",
-        "framework-crashrecovery",
         "framework-devicelock",
         "framework-graphics",
         "framework-healthfitness",
@@ -106,7 +105,6 @@ combined_apis {
     system_server_classpath: [
         "service-art",
         "service-configinfrastructure",
-        "service-crashrecovery",
         "service-healthfitness",
         "service-media-s",
         "service-permission",

boot/Android.bp

@@ -83,10 +83,6 @@ custom_platform_bootclasspath {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",
         },
-        {
-            apex: "com.android.crashrecovery",
-            module: "com.android.crashrecovery-bootclasspath-fragment",
-        },
         {
             apex: "com.android.devicelock",
             module: "com.android.devicelock-bootclasspath-fragment",