Merge changes from topic...

Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main am: 7c9ab4f5

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



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