[automerger skipped] Merge "ClientModeImpl: Use WifiInfo to get current bssid" into mainline-prod am: 9a4e409b5b -s ours

am skip reason: Change-Id I5a35b4863d1bd87ed77cf16bb9c24a6d75478ff0 with SHA-1 d9cdbc2999 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/13154920

Change-Id: I276b8443ddb00c07bf2ef4423a968437db45e9e5
tree: 15d8be6547d7ca3b4d0b91e453cf6021054f0a07
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg