Merge "Fix VoicemailPlaybackTest flakiness." into mnc-dev
tree: 7c6d32e8bb4c2c18019b0ea9913ac0288076379b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags