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

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



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