Merge "[RTT] Add API for number of measurements" into pi-dev
am: d1c5b6695f

Change-Id: I75b5aa6eb2bea59ad8e022a00268b585a0de146c