Snap for 8730993 from 3d45c6f550274b2331982316704fb01eaef82b24 to mainline-tzdata3-release

Change-Id: Iefc1495b9a3b3a8d7fee27ca229fcf23d57e4943
diff --git a/Android.bp b/Android.bp
index 8360f69..4644987 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,6 @@
     host_supported: true,
     vendor_available: true,
     product_available: true,
-    ramdisk_available: true,
     recovery_available: true,
     vndk: {
         enabled: true,
@@ -84,7 +83,6 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adbd",
-        "com.android.compos",
         "com.android.media.swcodec",
         "com.android.virt",
     ],
diff --git a/METADATA b/METADATA
index 052422f..076bc04 100644
--- a/METADATA
+++ b/METADATA
@@ -12,7 +12,4 @@
     month: 2
     day: 5
   }
-  security {
-    tag: "NVD-CPE2.3:cpe:/a:tcpdump:libpcap:-"
-  }
 }