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

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



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