Merge changes from topic "Revertmetrics" into q-keystone-qcom-dev

* changes:
  Metrics: Fix compilation issues AdapterService.obfuscateAddress
  Revert "Revert "Metrics: Return empty array for null address in obfuscateAddress()""
  Revert "Revert "Metrics: Use byte[] instead of ByteString in AdapterService.obfuscateAddress""