[automerger skipped] Merge "Use libvendorsupport for vendor api level...

[automerger skipped] Merge "Use libvendorsupport for vendor api level calculation" into main am: bc645a1c am: 0d34c1bf am: bac2c927 -s ours

am skip reason: Merged-In I095353e602397220571e131431e7cbd1b8511fa6 with SHA-1 f2810caf is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2903648



Change-Id: I6979b5b987a5c6c13f6054c41687bb8c3481115b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>