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 am: 0d306eee

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



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