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

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

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



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