Merge "Remove VNDK version string from intermediate dump paths" into main am: 035ccb9f9a

Original change: https://android-review.googlesource.com/c/platform/development/+/2967126

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