Snap for 8438558 from 74487b527c3445be8805f2b018461aee2a02254d to tm-qpr1-release am: 56c2b066e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/abi-dumps/vndk/+/17707025

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