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

[automerger skipped] Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 55c8a818 am: d70d0543 -s ours am: 25d4df77 -s ours

am skip reason: Merged-In If4555dcc7bc2d2c1f8fb9bee044de666d6db04a7 with SHA-1 d5dd07ce is already in history

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



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