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 am: aa666fac am: ded71658

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



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