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

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

Change-Id: Ic9980e52b08924e009e3e292f7e95117232b9cf6