Merge "Reapply "Handle symlinks in sbox"" into main am: a1eb34a7

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



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