[automerger skipped] Merge "Update VNDK version for common graphics HALs." am: 61c62c6b am: 9ccd4fb7 -s ours

am skip reason: Change-Id I4094240656f357b5ae52194befd0e10627b9fe23 with SHA-1 6006eb1b is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1464712

Change-Id: I5edde656a3ad45e38a39cb11d878da0394258e2e