merge protocol changes

merge https://github.com/covidsafe/App-Android/tree/protocol
when https://github.com/TraceDefenseCollab/Protocol/pull/9 is merged and updated on the server