Merge "Move assisted dialing out of P."
am: 8b1491d22c

Change-Id: Id91ca9965f36036758d9f6c87feac03dd24b1432