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

Change-Id: Ic643183bfeff084501f0e01cfc1f3e159106ed8a