Merge changes I99476bb2,Ie58a4c14

* changes:
  Guard VoicemailClientReceiver when VVM module is disabled
  Improve GoogleCallLogAdapterTest to better emulate reality
tree: a69bf52053493f9802d792567c7b7f9ee641ef72
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE