Merge "Remove android.system.keystore2 from VNDK" am: fa9372d9ec

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2110148

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