Merge "Attempt to unlink session file if hardlink fails" into udc-dev am: 7fbed032 am: 82105927

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



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