[automerger skipped] Merge "Make the enabled property configurable" into main...

[automerger skipped] Merge "Make the enabled property configurable" into main am: 3f01580c -s ours

am skip reason: Merged-In If355d24506e3f117d27b21442a6c02bca3402dc7 with SHA-1 021bf3d9 is already in history

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



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