Merge "Generate Java host library for keystore2 flags" into main am: 78889b3f26

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3311327

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