[automerger skipped] Merge "Properly support handover retry" am: 514ab6f4...

[automerger skipped] Merge "Properly support handover retry" am: 514ab6f4 am: 357d7c3a am: aa4093a9 am: c5209917 -s ours

am skip reason: Change-Id I1ee4e638892bfdba19f368c5e2ae7ecaf2c7364c with SHA-1 70a214c6 is in history

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

Change-Id: I969b36f9a2d079ed746029f6e0260b800f1d4941