[automerger skipped] Merge "Add ro.vendor.build.dont_use_vabc to disable VABC...

[automerger skipped] Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev am: 6e2acf1c -s ours

am skip reason: Merged-In Iceb2fb1f399d38a51722352a86ddf68af05fa24e with SHA-1 10eac08f is already in history

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

Change-Id: I390aac7c508bad3c92012c0f595d0ba6ea991c82