[automerger skipped] Merge "Merge "Add test for WifiInfo#getFrequency()" into qt-r1-dev am: 3305d126d9 am: e69a606536" into qt-qpr1-dev-plus-aosp
am: c690320cea -s ours
am skip reason: change_id I070b16661bc72a5c5035b0b227821b680d7d71ba with SHA1 5ac5569516 is in history

Change-Id: I718bf708bc304abc7e7d1e6ec9b883c9d1bc7f95
tree: 6900057e1e7e05f67d602dc946ebf7dd31ed78f6
  1. tests/