Merge "Fix how we delete the symlink" into main am: 44d1053ae9 am: 117674ce58

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

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