Merge changes I30d7a841,Idbc526df,Ie90ec6e9,Ib0316663 into oc-dr1-dev

* changes:
  [AWARE] Add metrics for data-path session duration
  [AWARE] Add NDP (data-path) creation duration metrics
  [AWARE] Add NAN data-path (NDP/NDI) metrics
  [AWARE] Simplify Discovery Session metrics collection