[automerger skipped] Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into...

[automerger skipped] Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093 am: 8d196a0c -s ours

am skip reason: Merged-In Iba0a546ef2b721b929b791c6a9e6c854e9bec909 with SHA-1 bbaa5efb is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2806341



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