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

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



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