Merge "Properly support handover retry" am: 514ab6f4c8

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

Change-Id: Ic46de87c2f4a3e6b7ae99a08fc94e615d565683c