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

Change-Id: I7627e03c55610461273f51b6220b1c0e42a98161