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

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

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



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