Merge "Mark event-based handover constants as deprecated." am: 5604cc2516 am: 190a8121c2
am: 1e1928baf1

Change-Id: Ibd1758f23d5d147b33bf692742c540a875ac563e