DO NOT MERGE reset ub-contactsdialer-b-dev to ub-contactsdialer-master-dev
am: 49637ec  -s ours

* commit '49637ecb5d3d125b2b295c3ec335c53666580851': (1421 commits)
  Follow framework refactoring.
  Import translations. DO NOT MERGE
  Fixing blocked number ringtone after E911 call
  Bumping version to 30000 for NYC prebuilt
  Bumping version to 20504 for B release
  Enabling new filtering
  Adding logging for migrate blocked numbers
  Updating GreatWall to use modifiable flag
  Keeping migration dialog up while migration in progress
  Updating settings to use system blocked numbers ui
  Implemented blocked numbers migration
  Add GoogleDialer project to settings.gradle
  Potential fix for voicemail icon near dialer but no voicemail.
  Adding block numbers migration dialog
  Import translations. DO NOT MERGE
  Add share voicemail functionality.
  Refactor voicemail archive code.
  Adding sharedPref for blocked number migration
  Hiding add number button in Blocked Management UI
  Removing hardcoded database column name
  ...