Merge "Add keystore2_flags_java-framework" into aosp-main-future