Merge changes from topic "vhal_v3" into main

* changes:
  Add UNKNOWN to VehicleAreaSeat aidl.
  Update VHAL property version to v3.

automotive/vehicle/Android.bp

@@ -22,6 +22,6 @@ cc_defaults {
     name: "VehicleHalInterfaceDefaults",
     static_libs: [
         "android.hardware.automotive.vehicle-V2-ndk",
-        "android.hardware.automotive.vehicle.property-V2-ndk",
+        "android.hardware.automotive.vehicle.property-V3-ndk",
     ],
 }

automotive/vehicle/aidl/aidl_test/Android.bp

@@ -52,7 +52,7 @@ android_test {
     ],
     static_libs: [
         "android.hardware.automotive.vehicle-V2-java",
-        "android.hardware.automotive.vehicle.property-V2-java",
+        "android.hardware.automotive.vehicle.property-V3-java",
         "androidx.test.runner",
         "truth-prebuilt",
     ],

automotive/vehicle/aidl_property/Android.bp

@@ -28,7 +28,7 @@ aidl_interface {
         // This HAL was originally part of android.hardware.automotive.vehicle
         "android/hardware/automotive/vehicle/*.aidl",
     ],
-    frozen: true,
+    frozen: false,
     stability: "vintf",
     backend: {
         cpp: {
@@ -52,7 +52,6 @@ aidl_interface {
             version: "2",
             imports: [],
         },
-
     ],
 
 }

automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl

@@ -34,6 +34,7 @@
 package android.hardware.automotive.vehicle;
 @Backing(type="int") @VintfStability
 enum VehicleAreaSeat {
+  UNKNOWN = 0x0000,
   ROW_1_LEFT = 0x0001,
   ROW_1_CENTER = 0x0002,
   ROW_1_RIGHT = 0x0004,

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl

@@ -22,6 +22,7 @@ package android.hardware.automotive.vehicle;
 @VintfStability
 @Backing(type="int")
 enum VehicleAreaSeat {
+    UNKNOWN = 0x0000,
     ROW_1_LEFT = 0x0001,
     ROW_1_CENTER = 0x0002,
     ROW_1_RIGHT = 0x0004,

automotive/vehicle/vhal_static_cpp_lib.mk

@@ -17,4 +17,4 @@
 
 LOCAL_STATIC_LIBRARIES += \
     android.hardware.automotive.vehicle-V2-ndk \
-    android.hardware.automotive.vehicle.property-V2-ndk
+    android.hardware.automotive.vehicle.property-V3-ndk

compatibility_matrices/compatibility_matrix.9.xml

@@ -94,7 +94,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.automotive.vehicle</name>
-        <version>1-2</version>
+        <version>1-3</version>
         <interface>
             <name>IVehicle</name>
             <instance>default</instance>