Merge "[AWARE] Metrics for Discovery + Ranging" into pi-dev am: cf8acd8a70
am: 4f216374b4

Change-Id: I3edd6d33978b76a98acee40970ad4bd8c6896cd9