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

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

Change-Id: Ia7f589101bbdfab0f1c460a04b3b56eb2cf723d3