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

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

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



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