Merge "Disable assisted dialing when the phone is User Locked."
am: 53474a1dca

Change-Id: I3227bc910679a1e58ca69ba924deb3565ac5dd99