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

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

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