Merge "Remove support for event-based handovers." am: b2c1daf861 am: 3e232b28af
am: 4b4d6f3072

Change-Id: I65d196d86eeda26c757adce77119cd5f62e9fbce