Merge changes I8578dd2c,Ia8e581f1

* changes:
  Send PhoneAccountHandle with ACTION_CONFIGURE_VOICEMAIL
  Fix NPE in contacts fragment.
tree: 3e6418fc85a41ccfb06b362f39f462485061e80d
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE