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

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



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