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

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



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