[automerger skipped] Merge "Add android.security.flags-aconfig-java-export...

[automerger skipped] Merge "Add android.security.flags-aconfig-java-export target" into main am: 21cd97b5 am: be33868c -s ours

am skip reason: Merged-In I14209528f744b1a5a093ba2ea5a0e3cf5dfc20a2 with SHA-1 a7e2d000 is already in history

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



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