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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7897543d5cc153947b0ce0cc01bd90b25c4e493