Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
am: 4df6c75b99

Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440