Merge "Modify the contact picker for call forwarding to directly show contact list"
am: 7b25036e6b

Change-Id: Iec219eec1987e4736e07a4f71178e4714553d2fe