Merge changes I8d78cc1a,I9b711d42 into main

* changes:
  Add traces for measure Audio-Haptics latency (mediaServer)
  Add traces in AudioFlinger to measure Audio-Haptics latency