[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 82acd5f945 -s ours

am skip reason: Merged-In I24fb9c25522accfc4354d176207a9851dd018a3b with SHA-1 2b76118ddf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/vndk/+/15571659

Change-Id: I9f566c047334a38d7845065a1c3d5482ae5e57cf