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

Change-Id: I8955451d74d157bec6fe79fac2ad9cb1d17e8995