Revert "initial attempts to improve data handoff stability"

This reverts commit 820157ee198e0f9924013d1dfef701ba1e3a46f2.
This is not needed since buildWaitingApns was patched to handle mismatched radio tech and bearer values for toro.
use PhoneConstant value instead of string here for consistency