Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d46 am:...

Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d46 am: a61ed55d am: bc18f8c1 am: 8256c1b6 am: 892120d1

Original change: https://android-review.googlesource.com/c/platform/build/+/2747261



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