[automerger skipped] Merge "Update test: true to mode: "test" in...

[automerger skipped] Merge "Update test: true to mode: "test" in java_aconfig_library" into main am: 3f667564 am: c0f950f8 am: edc9f6bf -s ours

am skip reason: Merged-In I630782e0280be8687d55b5878da1a253c0f0be1a with SHA-1 f64327d9 is already in history

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



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