Update ABI dump after fixing USER_IDENTIFICATION_ASSOCIATION structs. am: 826ab5830a

Change-Id: I92397864d630f43e5e5bc4dc1b7db7eb59a8907e
diff --git a/30/32/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/32/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index fb624d8..171253c 100644
--- a/30/32/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/32/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9861,19 +9861,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10021,19 +10021,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10879,19 +10879,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11032,19 +11032,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11167,19 +11167,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11671,19 +11671,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,6 +13100,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13155,7 +13165,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13440,20 +13450,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13598,20 +13608,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19008,7 +19018,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19034,12 +19049,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19060,18 +19080,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21723,6 +21748,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21766,49 +21834,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22499,6 +22524,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22538,45 +22602,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/32/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/32/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index 08b480c..4bb80ce 100644
--- a/30/32/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/32/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9860,19 +9860,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10020,19 +10020,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10878,19 +10878,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11031,19 +11031,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11166,19 +11166,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11670,19 +11670,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13099,6 +13099,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13154,7 +13164,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13439,20 +13449,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13597,20 +13607,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19007,7 +19017,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19033,12 +19048,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19059,18 +19079,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21722,6 +21747,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21765,49 +21833,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22498,6 +22523,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22537,45 +22601,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/arm64_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/arm64_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index e79055b..c704a75 100644
--- a/30/64/arm64_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/arm64_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9861,19 +9861,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10021,19 +10021,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10879,19 +10879,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11032,19 +11032,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11167,19 +11167,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11671,19 +11671,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,6 +13100,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13155,7 +13165,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13440,20 +13450,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13598,20 +13608,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19018,7 +19028,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19044,12 +19059,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19070,18 +19090,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21733,6 +21758,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21776,49 +21844,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22509,6 +22534,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22548,45 +22612,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index fb624d8..171253c 100644
--- a/30/64/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/arm_armv7-a-neon/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9861,19 +9861,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10021,19 +10021,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10879,19 +10879,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11032,19 +11032,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11167,19 +11167,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11671,19 +11671,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,6 +13100,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13155,7 +13165,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13440,20 +13450,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13598,20 +13608,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19008,7 +19018,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19034,12 +19049,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19060,18 +19080,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21723,6 +21748,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21766,49 +21834,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22499,6 +22524,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22538,45 +22602,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/arm_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/arm_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index fb624d8..171253c 100644
--- a/30/64/arm_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/arm_armv8-a/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9861,19 +9861,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10021,19 +10021,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10879,19 +10879,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11032,19 +11032,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11167,19 +11167,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11671,19 +11671,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,6 +13100,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13155,7 +13165,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13440,20 +13450,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13598,20 +13608,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19008,7 +19018,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19034,12 +19049,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19060,18 +19080,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21723,6 +21748,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21766,49 +21834,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22499,6 +22524,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22538,45 +22602,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index 08b480c..4bb80ce 100644
--- a/30/64/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/x86/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9860,19 +9860,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10020,19 +10020,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10878,19 +10878,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11031,19 +11031,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11166,19 +11166,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11670,19 +11670,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13099,6 +13099,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13154,7 +13164,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13439,20 +13449,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13597,20 +13607,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19007,7 +19017,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19033,12 +19048,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19059,18 +19079,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21722,6 +21747,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21765,49 +21833,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22498,6 +22523,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22537,45 +22601,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index 9ac6583..e2f5249 100644
--- a/30/64/x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9860,19 +9860,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10020,19 +10020,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10878,19 +10878,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11031,19 +11031,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11166,19 +11166,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11670,19 +11670,19 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13099,6 +13099,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13154,7 +13164,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13439,20 +13449,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13597,20 +13607,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19017,7 +19027,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19043,12 +19058,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19069,18 +19089,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21732,6 +21757,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21775,49 +21843,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22508,6 +22533,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22547,45 +22611,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {
diff --git a/30/64/x86_x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump b/30/64/x86_x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
index 08b480c..4bb80ce 100644
--- a/30/64/x86_x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
+++ b/30/64/x86_x86_64/source-based/android.hardware.automotive.vehicle@2.0.so.lsdump
@@ -9860,19 +9860,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue &",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType &",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIRKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10020,19 +10020,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> &",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> &",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIRKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10878,19 +10878,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPKN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11031,19 +11031,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11166,19 +11166,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue> *",
-   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType> *",
+   "referenced_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIPKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11670,19 +11670,19 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue *",
-   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
-   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
+   "linker_set_key" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "name" : "android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType *",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
+   "self_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_033UserIdentificationAssociationTypeE",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13099,6 +13099,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "name" : "const android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation",
+   "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "_ZTIKN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
    "name" : "const android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam",
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_032VehicleApPowerStateShutdownParamE",
@@ -13154,7 +13164,7 @@
    "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "self_type" : "_ZTIKN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/automotive/vehicle/2.0/android.hardware.automotive.vehicle@2.0_genc++_headers/gen/android/hardware/automotive/vehicle/2.0/types.h"
   },
   {
    "alignment" : 4,
@@ -13439,20 +13449,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13597,20 +13607,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
+   "linker_set_key" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "name" : "const android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationType>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
+   "self_type" : "_ZTIKN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19007,7 +19017,12 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "numberAssociation",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19033,12 +19048,17 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociationTypes",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
@@ -19059,18 +19079,23 @@
    "fields" :
    [
     {
+     "field_name" : "requestId",
+     "referenced_type" : "_ZTIi"
+    },
+    {
      "field_name" : "userInfo",
+     "field_offset" : 32,
      "referenced_type" : "_ZTIN7android8hardware10automotive7vehicle4V2_08UserInfoE"
     },
     {
      "field_name" : "numberAssociations",
-     "field_offset" : 64,
+     "field_offset" : 96,
      "referenced_type" : "_ZTIi"
     },
     {
      "field_name" : "associations",
      "field_offset" : 128,
-     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
+     "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
     }
    ],
    "linker_set_key" : "_ZTIN7android8hardware10automotive7vehicle4V2_028UserIdentificationSetRequestE",
@@ -21722,6 +21747,49 @@
    [
     {
      "access" : "private",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "_ZTIy"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "name" : "android::hardware::details::hidl_pointer<UserIdentificationSetAssociation>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
+   "record_kind" : "union",
+   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEUt_E",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEUt_E"
     }
    ],
@@ -21765,49 +21833,6 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mPointer",
-     "referenced_type" : "_ZTIPN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-    },
-    {
-     "field_name" : "_pad",
-     "referenced_type" : "_ZTIy"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "name" : "android::hardware::details::hidl_pointer<UserIdentificationAssociationSetValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5)",
-   "record_kind" : "union",
-   "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "self_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEUt_E",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEUt_E"
     }
    ],
@@ -22498,6 +22523,45 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
+     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "_ZTIj"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPad",
+     "field_offset" : 104,
+     "referenced_type" : "_ZTIA3_h"
+    }
+   ],
+   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationSetAssociation>",
+   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_032UserIdentificationSetAssociationEEE",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" :
+   [
+    "_ZTIN7android8hardware10automotive7vehicle4V2_032UserIdentificationSetAssociationE"
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_033UserIdentificationAssociationTypeEEE"
     },
     {
@@ -22537,45 +22601,6 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnsBuffer",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIb"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPad",
-     "field_offset" : 104,
-     "referenced_type" : "_ZTIA3_h"
-    }
-   ],
-   "linker_set_key" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "name" : "android::hardware::hidl_vec<android::hardware::automotive::vehicle::V2_0::UserIdentificationAssociationSetValue>",
-   "referenced_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "self_type" : "_ZTIN7android8hardware8hidl_vecINS0_10automotive7vehicle4V2_037UserIdentificationAssociationSetValueEEE",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" :
-   [
-    "_ZTIN7android8hardware10automotive7vehicle4V2_037UserIdentificationAssociationSetValueE"
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
      "referenced_type" : "_ZTIN7android8hardware7details12hidl_pointerINS0_10automotive7vehicle4V2_08UserInfoEEE"
     },
     {