Merge changes I0e1d8d98,I671105ec,I3fd72694,I2586f758,I07127554, ...

* changes:
  Update REASON_IMS_ACCESS_BLOCKED definition to match framework change.
  Use NOTIFICATION_INCOMING_CALL_QUIET when the in call UI is visible
  Fix NPE crash when haning up conference call.
  Automated g4 rollback of changelist 160696979.
  Fix 2 NPEs in CallLogAdapter.
  Fix concurrency issue in constructor.
  Move voicemail notification dismissing to VisualVoicemailCallLogFragment
tree: 7a12db7b53684f7fa64c583da1cae91ca0cfa2c3
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE