Merge "aconfig: add Java integration tests" am: 1120cb8a am: e6bcd369

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



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