Merge "Properly support handover retry" am: 514ab6f4c8 am: 357d7c3a04

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

Change-Id: I2497873b41e44db9d9211878deffdcc3d6a6f3ec