[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: 5a3dbd75 am: 68182d5b -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: I8a8915bac20e1d3a92c1d418e8f6c0c5680ee728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>