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

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



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