Merge "trusty: keymint: trusty-keymint-apex.mk: fix condition" into main am:...

Merge "trusty: keymint: trusty-keymint-apex.mk: fix condition" into main am: f836b35e am: 3dcd94b3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3484912



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