Merge "Add assisted dialing properties to the framework." am: f5bec0d781 am: 1d9fc9a490
am: c73edfa2c6  -s ours

Change-Id: I96c354bc5895fe62eafcf1732593910d7aa9c70d