Merge "Update apex test to verify behavior" am: 7754be76 am: f25231bf

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



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