[automerger skipped] Merge "Support handover retry" am: 0c47ab06 am:...

[automerger skipped] Merge "Support handover retry" am: 0c47ab06 am: 5f6c9d22 am: 24fe6340 am: db47938c am: 95ec8118 -s ours

am skip reason: Change-Id Ib6fd6a4d7cf242a4c17337607c188a07188df9e5 with SHA-1 df75e308 is in history

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

Change-Id: Ied762157c25f2be01bdf682c11b174ee145fba7a