Merge "Fix how we delete the symlink" into main am: 44d1053a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3319581



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