Merge "Allow test numbers to be dialed from APM and wait for IN_SERVICE" am: c02ca66716 am: a92108e485
am: ed7719998c

Change-Id: If059a3960f4c6aa3eebadb844c912e4b7006bc42