[automerger skipped] Merge "Update VNDK version for common graphics HALs." am: 3695285a am: c455ec4f -s ours

am skip reason: Change-Id I84fc02127254c6b9d6d7858e140bd256b0dff44b with SHA-1 b432a59d is in history

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

Change-Id: Iffec83b9b71680a7dcfc1c9c0632fa08bc15105e