Merge "KeyMint: Use unstable-ndk_platform" am: 92fdb33e27

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1532844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia91099e42c8ed500fca29e6a4c8a9ea6431eeac8