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

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

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