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

Change-Id: I854e95a74e8f3682e3a32d7abd2f53b1dce0d2c1