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: 243686a7 am: 1b193d63 am: ed914339

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



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