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

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

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



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