[automerger skipped] Merge "Add keystore2_flags_java-framework" into...

[automerger skipped] Merge "Add keystore2_flags_java-framework" into aosp-main-future am: d2f65566 -s ours

am skip reason: Merged-In I29bb8f9108747a0ed2a1a678811858e8572d285f with SHA-1 ac66333a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30412173



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