Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c84 am:...

Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c84 am: 230d729b am: 7cb1d764 am: 45479b6c am: 64702bdd

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



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