Merge changes from topic "parallel-singletons" am: 47514686

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



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