Merge "Prevent VABC from being disabled on release-key builds" into main am:...

Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666 am: fc35a79c

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



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