Snap for 11689785 from e4be10887b9796e2a24c3c7a3ad70f584e9ad54e to mainline-conscrypt-release

Change-Id: Ifd8ad60bce3dbfbd79703777a9334c5d86d44ec5

tests/boot_tests.cpp

diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index 6aeded3..6264843 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp
@@ -35,6 +35,12 @@
 using android::hardware::weaver::V1_0::WeaverConfig;
 using android::hardware::weaver::V1_0::WeaverStatus;
 
+
+static bool IsAutomotiveDevice() {
+    auto hw_type = android::base::GetProperty("ro.hardware.type", "");
+    return hw_type == "automotive";
+}
+
 TEST(MetadataPartition, FirstStageMount) {
     Fstab fstab;
     if (ReadFstabFromDt(&fstab)) {
@@ -85,7 +91,7 @@
 }
 
 TEST(MetadataPartition, FsType) {
-    if (GetVsrLevel() < __ANDROID_API_T__) {
+    if (GetVsrLevel() < __ANDROID_API_T__ || IsAutomotiveDevice()) {
         GTEST_SKIP();
     }