Merge "Remove android.system.keystore2 from VNDK" into tm-dev-plus-aosp am: 0e5484afb5 am: f7193e03d7

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

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