Revert "revert use PhoneNumberWaiter when NPE"

This reverts commit b1464ce3878394dd1596c606e5d17f35366b3ee5.
telephony: CDMA fix white list support

Change-Id: Ife872a4cb212c2ffd873970f1cc6d38225c84fcf