[automerger skipped] Merge "Don't throw if hint session death link doesn't exist" into main am: c809fceefd am: c2c34a8a63 am: eeb5009813 -s ours

am skip reason: Merged-In I985a1869bd7575cad44a21394dc4d68d2248be6c with SHA-1 ee142e2dbe is already in history

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

Change-Id: I7707114853052e56fbaaddc00a569e1fa1dfd88f
Signed-off-by: Automerger Merge Worker <[email protected]>