Merge "Add assisted dialing properties to the framework." am: f5bec0d781
am: 1d9fc9a490

Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27