* image-attachments:
  Downloadable gets priority over emojis only
  Display both message body and media, where relevant
  Store oobUri and preserve message body

* upstream/master: (27 commits)
  show 'using account …' in incoming call screen
  show contact jid in call screen
  bump copyright year
  Add handling of status code 333
  increase default pw length
  do not build emoji flavors
  pulled translations from transifex
  add changelog
  fix ice candidate sending when different credentials are used
  remove security check that ensures rtp connection was properly finished
  code clean up
  bump agp
  store encrypted pgp files in private cache dir
  do not restart wakelock if activity is finishing
  delete pre lolipop weOwnFile()
  use try with resources. remove unused methods
  rename version suffix to playstore/free
  bump appcompat, migrate to emoji2 and get rid of emoji flavor
  fix rare npe
  store recordings and documents in their respective folders
  ...

This makes 464XLAT networks work.

https://bugs.chromium.org/p/webrtc/issues/detail?id=10707

Instead of assuming that body must contain the OOB URI if present, store it
independently.  Instead of overwriting the body with file metadata, store the
metadata in its own location.

* subject:
  Store and display message subject

Creates a new database for cheogram that is attached to the main connection so
that joins between the two can happen.  This allows us to migrate our DB schema
seperately from the Conversations schema to keep merging with upstream more realistic.

* dialler-integration-3:
  Unify phone number normalization with Quicksy
  Passing through initializing -> inititalized -> dialling more stable

closes #4071

This is used when something goes wrong with a MUC, e.g. a connection
error made the MUC kick you out. In this case you generally want to try
to rejoin.

* 'muc-kicked-technical-reasons' of https://github.com/Zash/Conversations:
  Add handling of status code 333

Show chatrooms and contacts together in one list and search searches both of them.

* 'feature/missed_call_notifications' of https://github.com/dmitry-markin/Conversations:
  Fix: show missed call notification if ringing timeout is reached
  Add missed call notification icon
  Missed call notifications

* github.com:iNPUTmice/Conversations:
  Change string format
  Add timestamp for all calls

* 'alwaysbatterydeopt' of https://github.com/licaon-kter/Conversations:
  Here too
  Show battery dialogue always

this only causes race conditions

Uses phone location and libphonenumber to normalize.

Rather than starting right at dialling, which seemed to cause sometimes delays
in the in call screen appearing and also a different behaviour when a post dial
string was present, passing through all the states with some time in between
seems to result in a more stable and consistent UX with no change to functionality.

* more-tags:
  Default dynamic tags to on
  Display phone number type/label as a tag where relevant
  Show dynamic tag "Android" when item is in Android contacts only

* dialler-integration-permissions:
  Ask user for microphone permission from dialler integration