Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786 am:...

Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786 am: 74447fa4 am: 592ec2ff am: c42483d8

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



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