am 93c30693: am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev

* commit '93c3069340241e06f716ff2fac9fb28f69e4eb89':