Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am:...

Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba555 am: d9bf9e3e am: 31c473d7

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

Change-Id: I86840d22fd9a240757e0c8f03663e96e26f0f7ed