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

* commit '997750dae94d65317b9362d8f1f04811c1b37842':