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

Change-Id: Ieedefb6be476d7d1a683e6aeeb9639ad25447c48