Merge "Add core-icu4j and consrypt to the ART boot image for testing." into...

Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main am: c07b049a am: 134c8083 am: 7b0e31a6 am: f45d3b09

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



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