Merge changes from topic "parallel-singletons" am: 47514686 am: 71f4fc9e am: 682b629b

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



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