Merge "Support handover retry" am: 0c47ab0656 am: 5f6c9d224f am: 24fe634048

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

Change-Id: I3b1b9abc1a08fd658254c0605200ccea96b8e069