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

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



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