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

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



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