Merge changes from topic "t-oob-p-metrics" into tm-mainline-prod

* changes:
  Use OOB and in-band pseudonyms
  Add a PseudonymManager to manage pseudonyms