Merge tag 'android-14.0.0_r31' into leaf-3.2

Android 14.0.0 Release 31 (AP1A.240405.002.A1)

* tag 'android-14.0.0_r31':
  Fix VendorTagDescriptorCache::getTagType
  Fix VendorTagId to be metadata_vendor_id_t

Change-Id: Iccb7a2c2c3b79b2075c2a72e1126e56f4a961a1d