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

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

Change-Id: I406f72bfbb3fc3058f5d03541dedd06b4ff326ea