Merge "Update dependencies on graphics.common HAL to latest" into main am: 7dab4e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341054

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

Author: Eino-Ville Talvala (Eddy)

libs/gralloc/types/Android.bp

@@ -56,7 +56,7 @@ cc_library {
     ],
 
     export_shared_lib_headers: [
-        "android.hardware.graphics.common-V5-ndk",
+        "android.hardware.graphics.common-V6-ndk",
         "android.hardware.graphics.mapper@4.0",
         "libhidlbase",
     ],

libs/graphicsenv/GraphicsEnv.cpp

@@ -92,7 +92,7 @@ static const char* kFormerlyVndkspLibrariesList =
     "android.hardware.common-V2-ndk.so:"
     "android.hardware.common.fmq-V1-ndk.so:"
     "android.hardware.graphics.allocator-V2-ndk.so:"
-    "android.hardware.graphics.common-V5-ndk.so:"
+    "android.hardware.graphics.common-V6-ndk.so:"
     "android.hardware.graphics.common@1.0.so:"
     "android.hardware.graphics.common@1.1.so:"
     "android.hardware.graphics.common@1.2.so:"