Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev am: 861f7fae2f
am: 5a698ccfc7

Change-Id: I614f5c4c2e8e76d9971bd36f30220c4432557165