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 am: e1cc0740

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



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