Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c786...

Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c786 am: c4298a32 am: 336739ca

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



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