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

Change-Id: Icd43cfa4219a2ac17b27be8d0c8a111988306b5e