Merge "Updates statsd ble scan CTS test" into pi-dev